From be904f818a66d8e7ec57863d09cbf1e0a0968173 Mon Sep 17 00:00:00 2001 From: Seppe Volkaerts Date: Thu, 20 Sep 2018 17:19:12 +0200 Subject: [PATCH 1/2] Update for Minecraft 1.13.1 --- build.gradle | 23 +- .../org/spongepowered/api/CatalogTypes.java | 50 +- .../spongepowered/api/block/BlockTypes.java | 880 ++++++++++++-- .../api/block/tileentity/Bed.java | 55 - .../api/block/tileentity/FlowerPot.java | 32 - .../api/block/tileentity/Jukebox.java | 20 +- .../api/block/tileentity/Note.java | 64 -- .../{Skull.java => PlayerHead.java} | 27 +- .../api/block/tileentity/TileEntityTypes.java | 10 +- .../api/block/trait/BooleanTraits.java | 560 ++++++++- .../api/block/trait/EnumTraits.java | 444 +++++-- .../api/block/trait/IntegerTraits.java | 94 +- .../org/spongepowered/api/data/key/Keys.java | 320 ++---- .../manipulator/catalog/CatalogBlockData.java | 150 +-- .../catalog/CatalogEntityData.java | 2 +- .../manipulator/catalog/CatalogItemData.java | 32 +- .../catalog/CatalogTileEntityData.java | 14 +- ...Data.java => ImmutableInvertibleData.java} | 23 +- .../ImmutableRepresentedPlayerData.java | 4 +- .../immutable/block/ImmutableAxisData.java | 7 - .../block/ImmutableBigMushroomPoresData.java | 106 ++ ...java => ImmutableChestAttachmentData.java} | 8 +- .../block/ImmutableDecayableData.java | 23 +- .../immutable/block/ImmutableDirtData.java | 38 - .../block/ImmutableDisguisedBlockData.java | 38 - .../block/ImmutableDoublePlantData.java | 38 - ...Data.java => ImmutableInstrumentData.java} | 13 +- ...eamlessData.java => ImmutableLitData.java} | 16 +- .../immutable/block/ImmutableLogAxisData.java | 41 - .../ImmutableNoteData.java | 9 +- .../block/ImmutableOccupiedData.java | 2 +- .../immutable/block/ImmutablePlantData.java | 39 - .../immutable/block/ImmutableQuartzData.java | 38 - .../immutable/block/ImmutableSandData.java | 38 - .../block/ImmutableSandstoneData.java | 39 - .../immutable/block/ImmutableShrubData.java | 38 - .../immutable/block/ImmutableSlabData.java | 38 - ...ata.java => ImmutableSlabPortionData.java} | 8 +- .../immutable/block/ImmutableStoneData.java | 38 - ...va => ImmutableSurfaceAttachmentData.java} | 14 +- .../immutable/block/ImmutableTreeData.java | 40 - .../immutable/block/ImmutableWallData.java | 38 - .../immutable/item/ImmutableCoalData.java | 39 - .../item/ImmutableCookedFishData.java | 43 - .../immutable/item/ImmutableFishData.java | 43 - .../item/ImmutableGoldenAppleData.java | 43 - .../data/manipulator/mutable/DyeableData.java | 5 +- .../{SkullData.java => InvertibleData.java} | 26 +- .../mutable/RepresentedPlayerData.java | 4 +- .../manipulator/mutable/block/AxisData.java | 8 +- .../mutable/block/BigMushroomPoresData.java | 105 ++ ...roomData.java => ChestAttachmentData.java} | 12 +- .../mutable/block/ConnectedDirectionData.java | 2 +- .../mutable/block/DecayableData.java | 23 +- .../manipulator/mutable/block/DirtData.java | 41 - .../mutable/block/DoublePlantData.java | 41 - .../manipulator/mutable/block/DropData.java | 2 +- .../manipulator/mutable/block/InWallData.java | 3 +- .../{PistonData.java => InstrumentData.java} | 11 +- .../mutable/block/LayeredData.java | 2 +- .../{DisguisedBlockData.java => LitData.java} | 21 +- .../mutable/block/LogAxisData.java | 43 - .../{tileentity => block}/NoteData.java | 8 +- .../mutable/block/OccupiedData.java | 2 +- .../manipulator/mutable/block/OpenData.java | 3 +- .../manipulator/mutable/block/PlantData.java | 41 - .../mutable/block/PortionData.java | 4 +- .../mutable/block/PrismarineData.java | 41 - .../manipulator/mutable/block/SandData.java | 41 - .../mutable/block/SandstoneData.java | 42 - .../mutable/block/SeamlessData.java | 49 - .../manipulator/mutable/block/ShrubData.java | 41 - .../manipulator/mutable/block/SlabData.java | 41 - .../{QuartzData.java => SlabPortionData.java} | 16 +- .../manipulator/mutable/block/StoneData.java | 41 - ...ckData.java => SurfaceAttachmentData.java} | 13 +- .../manipulator/mutable/block/TreeData.java | 43 - .../manipulator/mutable/block/WallData.java | 41 - .../mutable/entity/PersistingData.java | 4 +- .../manipulator/mutable/item/CoalData.java | 42 - .../mutable/item/CookedFishData.java | 42 - .../manipulator/mutable/item/FishData.java | 46 - .../mutable/item/GoldenAppleData.java | 43 - ...rdProperty.java => MusicDiscProperty.java} | 19 +- .../api/data/type/BigMushroomType.java | 36 - .../api/data/type/BigMushroomTypes.java | 69 -- .../api/data/type/BrickType.java | 37 - .../api/data/type/BrickTypes.java | 51 - ...hrubType.java => ChestAttachmentType.java} | 10 +- ...dFishes.java => ChestAttachmentTypes.java} | 14 +- .../spongepowered/api/data/type/CoalType.java | 37 - .../api/data/type/CookedFish.java | 43 - .../api/data/type/DirtTypes.java | 49 - .../api/data/type/DisguisedBlockType.java | 37 - .../api/data/type/DisguisedBlockTypes.java | 55 - .../api/data/type/DoublePlantType.java | 37 - .../api/data/type/DoublePlantTypes.java | 55 - .../org/spongepowered/api/data/type/Fish.java | 45 - .../spongepowered/api/data/type/Fishes.java | 51 - .../api/data/type/GoldenApple.java | 36 - .../api/data/type/GoldenApples.java | 47 - .../spongepowered/api/data/type/LogAxes.java | 48 - .../spongepowered/api/data/type/LogAxis.java | 34 - .../api/data/type/NotePitch.java | 4 +- .../api/data/type/PistonType.java | 37 - .../api/data/type/PistonTypes.java | 47 - .../api/data/type/PlantType.java | 34 - .../api/data/type/PlantTypes.java | 60 - .../api/data/type/PrismarineType.java | 34 - .../api/data/type/PrismarineTypes.java | 46 - .../api/data/type/QuartzType.java | 34 - .../api/data/type/QuartzTypes.java | 50 - .../spongepowered/api/data/type/SandType.java | 37 - .../api/data/type/SandstoneType.java | 34 - .../api/data/type/SandstoneTypes.java | 46 - .../api/data/type/ShrubTypes.java | 49 - .../api/data/type/SkullType.java | 37 - .../api/data/type/SkullTypes.java | 55 - .../type/{DirtType.java => SlabPortion.java} | 8 +- .../{CoalTypes.java => SlabPortions.java} | 14 +- .../spongepowered/api/data/type/SlabType.java | 34 - .../api/data/type/StoneType.java | 34 - .../api/data/type/StoneTypes.java | 54 - .../data/type/{WallType.java => Surface.java} | 6 +- .../type/{SandTypes.java => Surfaces.java} | 15 +- .../api/data/type/WallTypes.java | 47 - .../org/spongepowered/api/effect/Viewer.java | 16 +- .../api/effect/particle/ParticleOptions.java | 41 +- .../api/effect/particle/ParticleTypes.java | 103 +- .../api/effect/sound/SoundTypes.java | 609 ++++++---- .../RecordType.java => music/MusicDisc.java} | 10 +- .../sound/music/MusicDiscs.java} | 35 +- .../sound/{record => music}/package-info.java | 3 +- .../api/effect/sound/record/RecordTypes.java | 64 -- .../org/spongepowered/api/item/ItemTypes.java | 1020 ++++++++++++++--- .../api/item/inventory/ItemStack.java | 2 +- .../org/spongepowered/api/util/Cycleable.java | 3 +- .../spongepowered/api/util/TypeTokens.java | 108 +- .../api/world/gen/populator/DoublePlant.java | 15 +- .../gen/populator/{Flower.java => Plant.java} | 48 +- .../api/world/gen/populator/Shrub.java | 177 --- 141 files changed, 3802 insertions(+), 4750 deletions(-) delete mode 100644 src/main/java/org/spongepowered/api/block/tileentity/Bed.java delete mode 100644 src/main/java/org/spongepowered/api/block/tileentity/FlowerPot.java delete mode 100644 src/main/java/org/spongepowered/api/block/tileentity/Note.java rename src/main/java/org/spongepowered/api/block/tileentity/{Skull.java => PlayerHead.java} (68%) rename src/main/java/org/spongepowered/api/data/manipulator/immutable/{ImmutableSkullData.java => ImmutableInvertibleData.java} (66%) create mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomPoresData.java rename src/main/java/org/spongepowered/api/data/manipulator/immutable/block/{ImmutableBigMushroomData.java => ImmutableChestAttachmentData.java} (81%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDirtData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDisguisedBlockData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDoublePlantData.java rename src/main/java/org/spongepowered/api/data/manipulator/immutable/block/{ImmutablePrismarineData.java => ImmutableInstrumentData.java} (76%) rename src/main/java/org/spongepowered/api/data/manipulator/immutable/block/{ImmutableSeamlessData.java => ImmutableLitData.java} (71%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLogAxisData.java rename src/main/java/org/spongepowered/api/data/manipulator/immutable/{tileentity => block}/ImmutableNoteData.java (89%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePlantData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableQuartzData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandstoneData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableShrubData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabData.java rename src/main/java/org/spongepowered/api/data/manipulator/immutable/block/{ImmutableBrickData.java => ImmutableSlabPortionData.java} (83%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableStoneData.java rename src/main/java/org/spongepowered/api/data/manipulator/immutable/block/{ImmutablePistonData.java => ImmutableSurfaceAttachmentData.java} (75%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableTreeData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableWallData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCoalData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCookedFishData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableFishData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableGoldenAppleData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/{SkullData.java => InvertibleData.java} (71%) create mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomPoresData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/block/{BigMushroomData.java => ChestAttachmentData.java} (81%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DirtData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DoublePlantData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/block/{PistonData.java => InstrumentData.java} (83%) rename src/main/java/org/spongepowered/api/data/manipulator/mutable/block/{DisguisedBlockData.java => LitData.java} (76%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LogAxisData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/{tileentity => block}/NoteData.java (88%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PlantData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PrismarineData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandstoneData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SeamlessData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ShrubData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/block/{QuartzData.java => SlabPortionData.java} (77%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/StoneData.java rename src/main/java/org/spongepowered/api/data/manipulator/mutable/block/{BrickData.java => SurfaceAttachmentData.java} (82%) delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/TreeData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/block/WallData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CoalData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CookedFishData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/item/FishData.java delete mode 100644 src/main/java/org/spongepowered/api/data/manipulator/mutable/item/GoldenAppleData.java rename src/main/java/org/spongepowered/api/data/property/item/{RecordProperty.java => MusicDiscProperty.java} (74%) delete mode 100644 src/main/java/org/spongepowered/api/data/type/BigMushroomType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/BigMushroomTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/BrickType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/BrickTypes.java rename src/main/java/org/spongepowered/api/data/type/{ShrubType.java => ChestAttachmentType.java} (84%) rename src/main/java/org/spongepowered/api/data/type/{CookedFishes.java => ChestAttachmentTypes.java} (73%) delete mode 100644 src/main/java/org/spongepowered/api/data/type/CoalType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/CookedFish.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/DirtTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/DisguisedBlockType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/DisguisedBlockTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/DoublePlantType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/DoublePlantTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/Fish.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/Fishes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/GoldenApple.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/GoldenApples.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/LogAxes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/LogAxis.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PistonType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PistonTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PlantType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PlantTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PrismarineType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/PrismarineTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/QuartzType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/QuartzTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/SandType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/SandstoneType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/SandstoneTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/ShrubTypes.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/SkullType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/SkullTypes.java rename src/main/java/org/spongepowered/api/data/type/{DirtType.java => SlabPortion.java} (86%) rename src/main/java/org/spongepowered/api/data/type/{CoalTypes.java => SlabPortions.java} (75%) delete mode 100644 src/main/java/org/spongepowered/api/data/type/SlabType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/StoneType.java delete mode 100644 src/main/java/org/spongepowered/api/data/type/StoneTypes.java rename src/main/java/org/spongepowered/api/data/type/{WallType.java => Surface.java} (92%) rename src/main/java/org/spongepowered/api/data/type/{SandTypes.java => Surfaces.java} (75%) delete mode 100644 src/main/java/org/spongepowered/api/data/type/WallTypes.java rename src/main/java/org/spongepowered/api/effect/sound/{record/RecordType.java => music/MusicDisc.java} (88%) rename src/main/java/org/spongepowered/api/{data/type/SlabTypes.java => effect/sound/music/MusicDiscs.java} (51%) rename src/main/java/org/spongepowered/api/effect/sound/{record => music}/package-info.java (92%) delete mode 100644 src/main/java/org/spongepowered/api/effect/sound/record/RecordTypes.java rename src/main/java/org/spongepowered/api/world/gen/populator/{Flower.java => Plant.java} (78%) delete mode 100644 src/main/java/org/spongepowered/api/world/gen/populator/Shrub.java diff --git a/build.gradle b/build.gradle index c5ec7cf7ff5..b7bcbcdf3be 100644 --- a/build.gradle +++ b/build.gradle @@ -110,47 +110,28 @@ sortClassFields { add 'main', 'org.spongepowered.api.data.type.ArmorTypes' add 'main', 'org.spongepowered.api.data.type.Arts' add 'main', 'org.spongepowered.api.data.type.BannerPatternShapes' - add 'main', 'org.spongepowered.api.data.type.BigMushroomTypes' add 'main', 'org.spongepowered.api.data.type.BodyParts' - add 'main', 'org.spongepowered.api.data.type.BrickTypes' add 'main', 'org.spongepowered.api.data.type.Careers' - add 'main', 'org.spongepowered.api.data.type.CoalTypes' + add 'main', 'org.spongepowered.api.data.type.ChestAttachmentTypes' add 'main', 'org.spongepowered.api.data.type.ComparatorTypes' - add 'main', 'org.spongepowered.api.data.type.CookedFishes' - add 'main', 'org.spongepowered.api.data.type.DirtTypes' - add 'main', 'org.spongepowered.api.data.type.DisguisedBlockTypes' - add 'main', 'org.spongepowered.api.data.type.DoublePlantTypes' add 'main', 'org.spongepowered.api.data.type.DyeColors' - add 'main', 'org.spongepowered.api.data.type.Fishes' - add 'main', 'org.spongepowered.api.data.type.GoldenApples' add 'main', 'org.spongepowered.api.data.type.Hinges' add 'main', 'org.spongepowered.api.data.type.HorseColors' add 'main', 'org.spongepowered.api.data.type.HorseStyles' add 'main', 'org.spongepowered.api.data.type.InstrumentTypes' - add 'main', 'org.spongepowered.api.data.type.LogAxes' add 'main', 'org.spongepowered.api.data.type.NotePitches' add 'main', 'org.spongepowered.api.data.type.OcelotTypes' add 'main', 'org.spongepowered.api.data.type.ParrotVariants' add 'main', 'org.spongepowered.api.data.type.PickupRules' - add 'main', 'org.spongepowered.api.data.type.PistonTypes' - add 'main', 'org.spongepowered.api.data.type.PlantTypes' add 'main', 'org.spongepowered.api.data.type.PortionTypes' - add 'main', 'org.spongepowered.api.data.type.PrismarineTypes' add 'main', 'org.spongepowered.api.data.type.Professions' - add 'main', 'org.spongepowered.api.data.type.QuartzTypes' add 'main', 'org.spongepowered.api.data.type.RabbitTypes' add 'main', 'org.spongepowered.api.data.type.RailDirections' - add 'main', 'org.spongepowered.api.data.type.SandstoneTypes' - add 'main', 'org.spongepowered.api.data.type.SandTypes' - add 'main', 'org.spongepowered.api.data.type.ShrubTypes' add 'main', 'org.spongepowered.api.data.type.SkinParts' - add 'main', 'org.spongepowered.api.data.type.SkullTypes' - add 'main', 'org.spongepowered.api.data.type.SlabTypes' + add 'main', 'org.spongepowered.api.data.type.SlabPortions' add 'main', 'org.spongepowered.api.data.type.StairShapes' - add 'main', 'org.spongepowered.api.data.type.StoneTypes' add 'main', 'org.spongepowered.api.data.type.ToolTypes' add 'main', 'org.spongepowered.api.data.type.TreeTypes' - add 'main', 'org.spongepowered.api.data.type.WallTypes' add 'main', 'org.spongepowered.api.data.type.WireAttachmentTypes' add 'main', 'org.spongepowered.api.block.BlockTypes' add 'main', 'org.spongepowered.api.block.tileentity.TileEntityTypes' diff --git a/src/main/java/org/spongepowered/api/CatalogTypes.java b/src/main/java/org/spongepowered/api/CatalogTypes.java index 7d9b2c35686..00ef9805c73 100644 --- a/src/main/java/org/spongepowered/api/CatalogTypes.java +++ b/src/main/java/org/spongepowered/api/CatalogTypes.java @@ -40,7 +40,7 @@ import org.spongepowered.api.effect.potion.PotionEffectType; import org.spongepowered.api.effect.sound.SoundCategory; import org.spongepowered.api.effect.sound.SoundType; -import org.spongepowered.api.effect.sound.record.RecordType; +import org.spongepowered.api.effect.sound.music.MusicDisc; import org.spongepowered.api.entity.EntityType; import org.spongepowered.api.entity.ai.GoalType; import org.spongepowered.api.entity.ai.task.AITaskType; @@ -128,8 +128,6 @@ public final class CatalogTypes { public static final Class BAN_TYPE = BanType.class; - public static final Class BIG_MUSHROOM_TYPE = BigMushroomType.class; - public static final Class BIOME_TREE_TYPE = BiomeTreeType.class; public static final Class BIOME_TYPE = BiomeType.class; @@ -146,22 +144,16 @@ public final class CatalogTypes { public static final Class BOSS_BAR_OVERLAY = BossBarOverlay.class; - public static final Class BRICK_TYPE = BrickType.class; - public static final Class CAREER = Career.class; public static final Class CHAT_TYPE = ChatType.class; public static final Class CHAT_VISIBILITY = ChatVisibility.class; - public static final Class COAL_TYPE = CoalType.class; - public static final Class COLLISION_RULE = CollisionRule.class; public static final Class COMPARISON_TYPE = ComparatorType.class; - public static final Class COOKED_FISH = CookedFish.class; - public static final Class CRAFTING_RECIPES = CraftingRecipe.class; public static final Class CRITERION = Criterion.class; @@ -180,16 +172,10 @@ public final class CatalogTypes { public static final Class DIMENSION_TYPE = DimensionType.class; - public static final Class DIRT_TYPE = DirtType.class; - - public static final Class DISGUISED_BLOCK_TYPE = DisguisedBlockType.class; - public static final Class DISMOUNT_TYPE = DismountType.class; public static final Class DISPLAY_SLOT = DisplaySlot.class; - public static final Class DOUBLE_PLANT_TYPE = DoublePlantType.class; - public static final Class DYE_COLOR = DyeColor.class; public static final Class ENCHANTMENT_TYPE = EnchantmentType.class; @@ -204,8 +190,6 @@ public final class CatalogTypes { public static final Class FIREWORK_SHAPE = FireworkShape.class; - public static final Class FISH = Fish.class; - public static final Class FLUID_TYPE = FluidType.class; public static final Class GAME_MODE = GameMode.class; @@ -214,8 +198,6 @@ public final class CatalogTypes { public static final Class GOAL_TYPE = GoalType.class; - public static final Class GOLDEN_APPLE = GoldenApple.class; - public static final Class HAND_PREFERENCE = HandPreference.class; public static final Class HAND_TYPE = HandType.class; @@ -242,8 +224,6 @@ public final class CatalogTypes { public static final Class LLAMA_VARIANT = LlamaVariant.class; - public static final Class LOG_AXIS = LogAxis.class; - public static final Class MUSHROOM_TYPE = MushroomType.class; public static final Class NOTE_PITCH = NotePitch.class; @@ -260,10 +240,6 @@ public final class CatalogTypes { public static final Class PICKUP_RULE = PickupRule.class; - public static final Class PISTON_TYPE = PistonType.class; - - public static final Class PLANT_TYPE = PlantType.class; - public static final Class POPULATOR_OBJECT = PopulatorObject.class; public static final Class POPULATOR_TYPE = PopulatorType.class; @@ -274,37 +250,25 @@ public final class CatalogTypes { public static final Class POTION_EFFECT_TYPE = PotionEffectType.class; - public static final Class PRISMARINE_TYPE = PrismarineType.class; - public static final Class PROFESSION = Profession.class; - public static final Class QUARTZ_TYPE = QuartzType.class; - public static final Class QUERY_OPERATION_TYPE = QueryOperationType.class; public static final Class RABBIT_TYPE = RabbitType.class; public static final Class RAIL_DIRECTION = RailDirection.class; - public static final Class RECORD_TYPE = RecordType.class; + public static final Class MUSIC_DISC = MusicDisc.class; public static final Class ROTATION = Rotation.class; - public static final Class SANDSTONE_TYPE = SandstoneType.class; - - public static final Class SAND_TYPE = SandType.class; - public static final Class SELECTOR_TYPE = SelectorType.class; public static final Class SERIALIZATION_BEHAVIOR = SerializationBehavior.class; - public static final Class SHRUB_TYPE = ShrubType.class; - public static final Class SKIN_PART = SkinPart.class; - public static final Class SKULL_TYPE = SkullType.class; - - public static final Class SLAB_TYPE = SlabType.class; + public static final Class SLAB_PORTION = SlabPortion.class; public static final Class SOUND_CATEGORY = SoundCategory.class; @@ -318,14 +282,10 @@ public final class CatalogTypes { public static final Class STATISTIC_TYPE = StatisticType.class; - public static final Class STONE_TYPE = StoneType.class; - - public static final Class STRUCTURE_MODE = StructureMode.class; + public static final Class TELEPORT_TYPE = TeleportType.class; public static final Class TELEPORT_HELPER_FILTER = TeleportHelperFilter.class; - public static final Class TELEPORT_TYPE = TeleportType.class; - public static final Class TEXT_COLOR = TextColor.class; public static final Class TEXT_SERIALIZER = TextSerializer.class; @@ -346,8 +306,6 @@ public final class CatalogTypes { public static final Class VISIBILITY = Visibility.class; - public static final Class WALL_TYPE = WallType.class; - public static final Class WEATHER = Weather.class; public static final Class WIRE_ATTACHMENT_TYPE = WireAttachmentType.class; diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java index 9a414c8d334..af12aa4b104 100644 --- a/src/main/java/org/spongepowered/api/block/BlockTypes.java +++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java @@ -33,56 +33,164 @@ public final class BlockTypes { // SORTFIELDS:ON + public static final BlockType ACACIA_BUTTON = DummyObjectProvider.createFor(BlockType.class, "ACACIA_BUTTON"); + public static final BlockType ACACIA_DOOR = DummyObjectProvider.createFor(BlockType.class, "ACACIA_DOOR"); public static final BlockType ACACIA_FENCE = DummyObjectProvider.createFor(BlockType.class, "ACACIA_FENCE"); public static final BlockType ACACIA_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "ACACIA_FENCE_GATE"); + public static final BlockType ACACIA_LEAVES = DummyObjectProvider.createFor(BlockType.class, "ACACIA_LEAVES"); + + public static final BlockType ACACIA_LOG = DummyObjectProvider.createFor(BlockType.class, "ACACIA_LOG"); + + public static final BlockType ACACIA_PLANKS = DummyObjectProvider.createFor(BlockType.class, "ACACIA_PLANKS"); + + public static final BlockType ACACIA_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "ACACIA_PRESSURE_PLATE"); + + public static final BlockType ACACIA_SAPLING = DummyObjectProvider.createFor(BlockType.class, "ACACIA_SAPLING"); + + public static final BlockType ACACIA_SLAB = DummyObjectProvider.createFor(BlockType.class, "ACACIA_SLAB"); + public static final BlockType ACACIA_STAIRS = DummyObjectProvider.createFor(BlockType.class, "ACACIA_STAIRS"); + public static final BlockType ACACIA_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "ACACIA_TRAPDOOR"); + + public static final BlockType ACACIA_WOOD = DummyObjectProvider.createFor(BlockType.class, "ACACIA_WOOD"); + public static final BlockType ACTIVATOR_RAIL = DummyObjectProvider.createFor(BlockType.class, "ACTIVATOR_RAIL"); public static final BlockType AIR = DummyObjectProvider.createFor(BlockType.class, "AIR"); + public static final BlockType ALLIUM = DummyObjectProvider.createFor(BlockType.class, "ALLIUM"); + + public static final BlockType ANDESITE = DummyObjectProvider.createFor(BlockType.class, "ANDESITE"); + public static final BlockType ANVIL = DummyObjectProvider.createFor(BlockType.class, "ANVIL"); + public static final BlockType ATTACHED_MELON_STEM = DummyObjectProvider.createFor(BlockType.class, "ATTACHED_MELON_STEM"); + + public static final BlockType ATTACHED_PUMPKIN_STEM = DummyObjectProvider.createFor(BlockType.class, "ATTACHED_PUMPKIN_STEM"); + + public static final BlockType AZURE_BLUET = DummyObjectProvider.createFor(BlockType.class, "AZURE_BLUET"); + public static final BlockType BARRIER = DummyObjectProvider.createFor(BlockType.class, "BARRIER"); public static final BlockType BEACON = DummyObjectProvider.createFor(BlockType.class, "BEACON"); - public static final BlockType BED = DummyObjectProvider.createFor(BlockType.class, "BED"); - public static final BlockType BEDROCK = DummyObjectProvider.createFor(BlockType.class, "BEDROCK"); public static final BlockType BEETROOTS = DummyObjectProvider.createFor(BlockType.class, "BEETROOTS"); + public static final BlockType BIRCH_BUTTON = DummyObjectProvider.createFor(BlockType.class, "BIRCH_BUTTON"); + public static final BlockType BIRCH_DOOR = DummyObjectProvider.createFor(BlockType.class, "BIRCH_DOOR"); public static final BlockType BIRCH_FENCE = DummyObjectProvider.createFor(BlockType.class, "BIRCH_FENCE"); public static final BlockType BIRCH_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "BIRCH_FENCE_GATE"); + public static final BlockType BIRCH_LEAVES = DummyObjectProvider.createFor(BlockType.class, "BIRCH_LEAVES"); + + public static final BlockType BIRCH_LOG = DummyObjectProvider.createFor(BlockType.class, "BIRCH_LOG"); + + public static final BlockType BIRCH_PLANKS = DummyObjectProvider.createFor(BlockType.class, "BIRCH_PLANKS"); + + public static final BlockType BIRCH_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "BIRCH_PRESSURE_PLATE"); + + public static final BlockType BIRCH_SAPLING = DummyObjectProvider.createFor(BlockType.class, "BIRCH_SAPLING"); + + public static final BlockType BIRCH_SLAB = DummyObjectProvider.createFor(BlockType.class, "BIRCH_SLAB"); + public static final BlockType BIRCH_STAIRS = DummyObjectProvider.createFor(BlockType.class, "BIRCH_STAIRS"); + public static final BlockType BIRCH_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "BIRCH_TRAPDOOR"); + + public static final BlockType BIRCH_WOOD = DummyObjectProvider.createFor(BlockType.class, "BIRCH_WOOD"); + + public static final BlockType BLACK_BANNER = DummyObjectProvider.createFor(BlockType.class, "BLACK_BANNER"); + + public static final BlockType BLACK_BED = DummyObjectProvider.createFor(BlockType.class, "BLACK_BED"); + + public static final BlockType BLACK_CARPET = DummyObjectProvider.createFor(BlockType.class, "BLACK_CARPET"); + + public static final BlockType BLACK_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "BLACK_CONCRETE"); + + public static final BlockType BLACK_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "BLACK_CONCRETE_POWDER"); + public static final BlockType BLACK_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BLACK_GLAZED_TERRACOTTA"); public static final BlockType BLACK_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "BLACK_SHULKER_BOX"); + public static final BlockType BLACK_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "BLACK_STAINED_GLASS"); + + public static final BlockType BLACK_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "BLACK_STAINED_GLASS_PANE"); + + public static final BlockType BLACK_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BLACK_TERRACOTTA"); + + public static final BlockType BLACK_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "BLACK_WALL_BANNER"); + + public static final BlockType BLACK_WOOL = DummyObjectProvider.createFor(BlockType.class, "BLACK_WOOL"); + + public static final BlockType BLUE_BANNER = DummyObjectProvider.createFor(BlockType.class, "BLUE_BANNER"); + + public static final BlockType BLUE_BED = DummyObjectProvider.createFor(BlockType.class, "BLUE_BED"); + + public static final BlockType BLUE_CARPET = DummyObjectProvider.createFor(BlockType.class, "BLUE_CARPET"); + + public static final BlockType BLUE_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "BLUE_CONCRETE"); + + public static final BlockType BLUE_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "BLUE_CONCRETE_POWDER"); + public static final BlockType BLUE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BLUE_GLAZED_TERRACOTTA"); + public static final BlockType BLUE_ICE = DummyObjectProvider.createFor(BlockType.class, "BLUE_ICE"); + + public static final BlockType BLUE_ORCHID = DummyObjectProvider.createFor(BlockType.class, "BLUE_ORCHID"); + public static final BlockType BLUE_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "BLUE_SHULKER_BOX"); + public static final BlockType BLUE_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "BLUE_STAINED_GLASS"); + + public static final BlockType BLUE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "BLUE_STAINED_GLASS_PANE"); + + public static final BlockType BLUE_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BLUE_TERRACOTTA"); + + public static final BlockType BLUE_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "BLUE_WALL_BANNER"); + + public static final BlockType BLUE_WOOL = DummyObjectProvider.createFor(BlockType.class, "BLUE_WOOL"); + public static final BlockType BONE_BLOCK = DummyObjectProvider.createFor(BlockType.class, "BONE_BLOCK"); public static final BlockType BOOKSHELF = DummyObjectProvider.createFor(BlockType.class, "BOOKSHELF"); + public static final BlockType BRAIN_CORAL = DummyObjectProvider.createFor(BlockType.class, "BRAIN_CORAL"); + + public static final BlockType BRAIN_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "BRAIN_CORAL_BLOCK"); + + public static final BlockType BRAIN_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "BRAIN_CORAL_FAN"); + + public static final BlockType BRAIN_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "BRAIN_CORAL_WALL_FAN"); + public static final BlockType BREWING_STAND = DummyObjectProvider.createFor(BlockType.class, "BREWING_STAND"); - public static final BlockType BRICK_BLOCK = DummyObjectProvider.createFor(BlockType.class, "BRICK_BLOCK"); + public static final BlockType BRICK_SLAB = DummyObjectProvider.createFor(BlockType.class, "BRICK_SLAB"); public static final BlockType BRICK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "BRICK_STAIRS"); + public static final BlockType BRICKS = DummyObjectProvider.createFor(BlockType.class, "BRICKS"); + + public static final BlockType BROWN_BANNER = DummyObjectProvider.createFor(BlockType.class, "BROWN_BANNER"); + + public static final BlockType BROWN_BED = DummyObjectProvider.createFor(BlockType.class, "BROWN_BED"); + + public static final BlockType BROWN_CARPET = DummyObjectProvider.createFor(BlockType.class, "BROWN_CARPET"); + + public static final BlockType BROWN_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "BROWN_CONCRETE"); + + public static final BlockType BROWN_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "BROWN_CONCRETE_POWDER"); + public static final BlockType BROWN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BROWN_GLAZED_TERRACOTTA"); public static final BlockType BROWN_MUSHROOM = DummyObjectProvider.createFor(BlockType.class, "BROWN_MUSHROOM"); @@ -91,20 +199,52 @@ public final class BlockTypes { public static final BlockType BROWN_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "BROWN_SHULKER_BOX"); + public static final BlockType BROWN_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "BROWN_STAINED_GLASS"); + + public static final BlockType BROWN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "BROWN_STAINED_GLASS_PANE"); + + public static final BlockType BROWN_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "BROWN_TERRACOTTA"); + + public static final BlockType BROWN_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "BROWN_WALL_BANNER"); + + public static final BlockType BROWN_WOOL = DummyObjectProvider.createFor(BlockType.class, "BROWN_WOOL"); + + public static final BlockType BUBBLE_COLUMN = DummyObjectProvider.createFor(BlockType.class, "BUBBLE_COLUMN"); + + public static final BlockType BUBBLE_CORAL = DummyObjectProvider.createFor(BlockType.class, "BUBBLE_CORAL"); + + public static final BlockType BUBBLE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "BUBBLE_CORAL_BLOCK"); + + public static final BlockType BUBBLE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "BUBBLE_CORAL_FAN"); + + public static final BlockType BUBBLE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "BUBBLE_CORAL_WALL_FAN"); + public static final BlockType CACTUS = DummyObjectProvider.createFor(BlockType.class, "CACTUS"); public static final BlockType CAKE = DummyObjectProvider.createFor(BlockType.class, "CAKE"); - public static final BlockType CARPET = DummyObjectProvider.createFor(BlockType.class, "CARPET"); - public static final BlockType CARROTS = DummyObjectProvider.createFor(BlockType.class, "CARROTS"); + public static final BlockType CARVED_PUMPKIN = DummyObjectProvider.createFor(BlockType.class, "CARVED_PUMPKIN"); + public static final BlockType CAULDRON = DummyObjectProvider.createFor(BlockType.class, "CAULDRON"); + public static final BlockType CAVE_AIR = DummyObjectProvider.createFor(BlockType.class, "CAVE_AIR"); + public static final BlockType CHAIN_COMMAND_BLOCK = DummyObjectProvider.createFor(BlockType.class, "CHAIN_COMMAND_BLOCK"); public static final BlockType CHEST = DummyObjectProvider.createFor(BlockType.class, "CHEST"); + public static final BlockType CHIPPED_ANVIL = DummyObjectProvider.createFor(BlockType.class, "CHIPPED_ANVIL"); + + public static final BlockType CHISELED_QUARTZ_BLOCK = DummyObjectProvider.createFor(BlockType.class, "CHISELED_QUARTZ_BLOCK"); + + public static final BlockType CHISELED_RED_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "CHISELED_RED_SANDSTONE"); + + public static final BlockType CHISELED_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "CHISELED_SANDSTONE"); + + public static final BlockType CHISELED_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "CHISELED_STONE_BRICKS"); + public static final BlockType CHORUS_FLOWER = DummyObjectProvider.createFor(BlockType.class, "CHORUS_FLOWER"); public static final BlockType CHORUS_PLANT = DummyObjectProvider.createFor(BlockType.class, "CHORUS_PLANT"); @@ -115,37 +255,141 @@ public final class BlockTypes { public static final BlockType COAL_ORE = DummyObjectProvider.createFor(BlockType.class, "COAL_ORE"); + public static final BlockType COARSE_DIRT = DummyObjectProvider.createFor(BlockType.class, "COARSE_DIRT"); + public static final BlockType COBBLESTONE = DummyObjectProvider.createFor(BlockType.class, "COBBLESTONE"); + public static final BlockType COBBLESTONE_SLAB = DummyObjectProvider.createFor(BlockType.class, "COBBLESTONE_SLAB"); + + public static final BlockType COBBLESTONE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "COBBLESTONE_STAIRS"); + public static final BlockType COBBLESTONE_WALL = DummyObjectProvider.createFor(BlockType.class, "COBBLESTONE_WALL"); + public static final BlockType COBWEB = DummyObjectProvider.createFor(BlockType.class, "COBWEB"); + public static final BlockType COCOA = DummyObjectProvider.createFor(BlockType.class, "COCOA"); public static final BlockType COMMAND_BLOCK = DummyObjectProvider.createFor(BlockType.class, "COMMAND_BLOCK"); - public static final BlockType CONCRETE = DummyObjectProvider.createFor(BlockType.class, "CONCRETE"); + public static final BlockType COMPARATOR = DummyObjectProvider.createFor(BlockType.class, "COMPARATOR"); - public static final BlockType CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "CONCRETE_POWDER"); + public static final BlockType CONDUIT = DummyObjectProvider.createFor(BlockType.class, "CONDUIT"); + + public static final BlockType CRACKED_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "CRACKED_STONE_BRICKS"); public static final BlockType CRAFTING_TABLE = DummyObjectProvider.createFor(BlockType.class, "CRAFTING_TABLE"); + public static final BlockType CREEPER_HEAD = DummyObjectProvider.createFor(BlockType.class, "CREEPER_HEAD"); + + public static final BlockType CREEPER_WALL_HEAD = DummyObjectProvider.createFor(BlockType.class, "CREEPER_WALL_HEAD"); + + public static final BlockType CUT_RED_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "CUT_RED_SANDSTONE"); + + public static final BlockType CUT_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "CUT_SANDSTONE"); + + public static final BlockType CYAN_BANNER = DummyObjectProvider.createFor(BlockType.class, "CYAN_BANNER"); + + public static final BlockType CYAN_BED = DummyObjectProvider.createFor(BlockType.class, "CYAN_BED"); + + public static final BlockType CYAN_CARPET = DummyObjectProvider.createFor(BlockType.class, "CYAN_CARPET"); + + public static final BlockType CYAN_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "CYAN_CONCRETE"); + + public static final BlockType CYAN_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "CYAN_CONCRETE_POWDER"); + public static final BlockType CYAN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "CYAN_GLAZED_TERRACOTTA"); public static final BlockType CYAN_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "CYAN_SHULKER_BOX"); + public static final BlockType CYAN_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "CYAN_STAINED_GLASS"); + + public static final BlockType CYAN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "CYAN_STAINED_GLASS_PANE"); + + public static final BlockType CYAN_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "CYAN_TERRACOTTA"); + + public static final BlockType CYAN_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "CYAN_WALL_BANNER"); + + public static final BlockType CYAN_WOOL = DummyObjectProvider.createFor(BlockType.class, "CYAN_WOOL"); + + public static final BlockType DAMAGED_ANVIL = DummyObjectProvider.createFor(BlockType.class, "DAMAGED_ANVIL"); + + public static final BlockType DANDELION = DummyObjectProvider.createFor(BlockType.class, "DANDELION"); + + public static final BlockType DARK_OAK_BUTTON = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_BUTTON"); + public static final BlockType DARK_OAK_DOOR = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_DOOR"); public static final BlockType DARK_OAK_FENCE = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_FENCE"); public static final BlockType DARK_OAK_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_FENCE_GATE"); + public static final BlockType DARK_OAK_LEAVES = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_LEAVES"); + + public static final BlockType DARK_OAK_LOG = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_LOG"); + + public static final BlockType DARK_OAK_PLANKS = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_PLANKS"); + + public static final BlockType DARK_OAK_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_PRESSURE_PLATE"); + + public static final BlockType DARK_OAK_SAPLING = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_SAPLING"); + + public static final BlockType DARK_OAK_SLAB = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_SLAB"); + public static final BlockType DARK_OAK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_STAIRS"); + public static final BlockType DARK_OAK_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_TRAPDOOR"); + + public static final BlockType DARK_OAK_WOOD = DummyObjectProvider.createFor(BlockType.class, "DARK_OAK_WOOD"); + + public static final BlockType DARK_PRISMARINE = DummyObjectProvider.createFor(BlockType.class, "DARK_PRISMARINE"); + + public static final BlockType DARK_PRISMARINE_SLAB = DummyObjectProvider.createFor(BlockType.class, "DARK_PRISMARINE_SLAB"); + + public static final BlockType DARK_PRISMARINE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "DARK_PRISMARINE_STAIRS"); + public static final BlockType DAYLIGHT_DETECTOR = DummyObjectProvider.createFor(BlockType.class, "DAYLIGHT_DETECTOR"); - public static final BlockType DAYLIGHT_DETECTOR_INVERTED = DummyObjectProvider.createFor(BlockType.class, "DAYLIGHT_DETECTOR_INVERTED"); + public static final BlockType DEAD_BRAIN_CORAL = DummyObjectProvider.createFor(BlockType.class, "DEAD_BRAIN_CORAL"); + + public static final BlockType DEAD_BRAIN_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DEAD_BRAIN_CORAL_BLOCK"); + + public static final BlockType DEAD_BRAIN_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_BRAIN_CORAL_FAN"); + + public static final BlockType DEAD_BRAIN_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_BRAIN_CORAL_WALL_FAN"); + + public static final BlockType DEAD_BUBBLE_CORAL = DummyObjectProvider.createFor(BlockType.class, "DEAD_BUBBLE_CORAL"); + + public static final BlockType DEAD_BUBBLE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DEAD_BUBBLE_CORAL_BLOCK"); + + public static final BlockType DEAD_BUBBLE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_BUBBLE_CORAL_FAN"); + + public static final BlockType DEAD_BUBBLE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_BUBBLE_CORAL_WALL_FAN"); + + public static final BlockType DEAD_BUSH = DummyObjectProvider.createFor(BlockType.class, "DEAD_BUSH"); + + public static final BlockType DEAD_FIRE_CORAL = DummyObjectProvider.createFor(BlockType.class, "DEAD_FIRE_CORAL"); + + public static final BlockType DEAD_FIRE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DEAD_FIRE_CORAL_BLOCK"); + + public static final BlockType DEAD_FIRE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_FIRE_CORAL_FAN"); + + public static final BlockType DEAD_FIRE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_FIRE_CORAL_WALL_FAN"); + + public static final BlockType DEAD_HORN_CORAL = DummyObjectProvider.createFor(BlockType.class, "DEAD_HORN_CORAL"); + + public static final BlockType DEAD_HORN_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DEAD_HORN_CORAL_BLOCK"); + + public static final BlockType DEAD_HORN_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_HORN_CORAL_FAN"); + + public static final BlockType DEAD_HORN_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_HORN_CORAL_WALL_FAN"); + + public static final BlockType DEAD_TUBE_CORAL = DummyObjectProvider.createFor(BlockType.class, "DEAD_TUBE_CORAL"); - public static final BlockType DEADBUSH = DummyObjectProvider.createFor(BlockType.class, "DEADBUSH"); + public static final BlockType DEAD_TUBE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DEAD_TUBE_CORAL_BLOCK"); + + public static final BlockType DEAD_TUBE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_TUBE_CORAL_FAN"); + + public static final BlockType DEAD_TUBE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "DEAD_TUBE_CORAL_WALL_FAN"); public static final BlockType DETECTOR_RAIL = DummyObjectProvider.createFor(BlockType.class, "DETECTOR_RAIL"); @@ -153,19 +397,19 @@ public final class BlockTypes { public static final BlockType DIAMOND_ORE = DummyObjectProvider.createFor(BlockType.class, "DIAMOND_ORE"); + public static final BlockType DIORITE = DummyObjectProvider.createFor(BlockType.class, "DIORITE"); + public static final BlockType DIRT = DummyObjectProvider.createFor(BlockType.class, "DIRT"); public static final BlockType DISPENSER = DummyObjectProvider.createFor(BlockType.class, "DISPENSER"); - public static final BlockType DOUBLE_PLANT = DummyObjectProvider.createFor(BlockType.class, "DOUBLE_PLANT"); - - public static final BlockType DOUBLE_STONE_SLAB = DummyObjectProvider.createFor(BlockType.class, "DOUBLE_STONE_SLAB"); + public static final BlockType DRAGON_EGG = DummyObjectProvider.createFor(BlockType.class, "DRAGON_EGG"); - public static final BlockType DOUBLE_STONE_SLAB2 = DummyObjectProvider.createFor(BlockType.class, "DOUBLE_STONE_SLAB2"); + public static final BlockType DRAGON_HEAD = DummyObjectProvider.createFor(BlockType.class, "DRAGON_HEAD"); - public static final BlockType DOUBLE_WOODEN_SLAB = DummyObjectProvider.createFor(BlockType.class, "DOUBLE_WOODEN_SLAB"); + public static final BlockType DRAGON_WALL_HEAD = DummyObjectProvider.createFor(BlockType.class, "DRAGON_WALL_HEAD"); - public static final BlockType DRAGON_EGG = DummyObjectProvider.createFor(BlockType.class, "DRAGON_EGG"); + public static final BlockType DRIED_KELP_BLOCK = DummyObjectProvider.createFor(BlockType.class, "DRIED_KELP_BLOCK"); public static final BlockType DROPPER = DummyObjectProvider.createFor(BlockType.class, "DROPPER"); @@ -175,10 +419,6 @@ public final class BlockTypes { public static final BlockType ENCHANTING_TABLE = DummyObjectProvider.createFor(BlockType.class, "ENCHANTING_TABLE"); - public static final BlockType ENDER_CHEST = DummyObjectProvider.createFor(BlockType.class, "ENDER_CHEST"); - - public static final BlockType END_BRICKS = DummyObjectProvider.createFor(BlockType.class, "END_BRICKS"); - public static final BlockType END_GATEWAY = DummyObjectProvider.createFor(BlockType.class, "END_GATEWAY"); public static final BlockType END_PORTAL = DummyObjectProvider.createFor(BlockType.class, "END_PORTAL"); @@ -189,19 +429,25 @@ public final class BlockTypes { public static final BlockType END_STONE = DummyObjectProvider.createFor(BlockType.class, "END_STONE"); - public static final BlockType FARMLAND = DummyObjectProvider.createFor(BlockType.class, "FARMLAND"); + public static final BlockType END_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "END_STONE_BRICKS"); - public static final BlockType FENCE = DummyObjectProvider.createFor(BlockType.class, "FENCE"); + public static final BlockType ENDER_CHEST = DummyObjectProvider.createFor(BlockType.class, "ENDER_CHEST"); + + public static final BlockType FARMLAND = DummyObjectProvider.createFor(BlockType.class, "FARMLAND"); - public static final BlockType FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "FENCE_GATE"); + public static final BlockType FERN = DummyObjectProvider.createFor(BlockType.class, "FERN"); public static final BlockType FIRE = DummyObjectProvider.createFor(BlockType.class, "FIRE"); - public static final BlockType FLOWER_POT = DummyObjectProvider.createFor(BlockType.class, "FLOWER_POT"); + public static final BlockType FIRE_CORAL = DummyObjectProvider.createFor(BlockType.class, "FIRE_CORAL"); + + public static final BlockType FIRE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "FIRE_CORAL_BLOCK"); + + public static final BlockType FIRE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "FIRE_CORAL_FAN"); - public static final BlockType FLOWING_LAVA = DummyObjectProvider.createFor(BlockType.class, "FLOWING_LAVA"); + public static final BlockType FIRE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "FIRE_CORAL_WALL_FAN"); - public static final BlockType FLOWING_WATER = DummyObjectProvider.createFor(BlockType.class, "FLOWING_WATER"); + public static final BlockType FLOWER_POT = DummyObjectProvider.createFor(BlockType.class, "FLOWER_POT"); public static final BlockType FROSTED_ICE = DummyObjectProvider.createFor(BlockType.class, "FROSTED_ICE"); @@ -213,27 +459,67 @@ public final class BlockTypes { public static final BlockType GLOWSTONE = DummyObjectProvider.createFor(BlockType.class, "GLOWSTONE"); - public static final BlockType GOLDEN_RAIL = DummyObjectProvider.createFor(BlockType.class, "GOLDEN_RAIL"); - public static final BlockType GOLD_BLOCK = DummyObjectProvider.createFor(BlockType.class, "GOLD_BLOCK"); public static final BlockType GOLD_ORE = DummyObjectProvider.createFor(BlockType.class, "GOLD_ORE"); + public static final BlockType GRANITE = DummyObjectProvider.createFor(BlockType.class, "GRANITE"); + public static final BlockType GRASS = DummyObjectProvider.createFor(BlockType.class, "GRASS"); + public static final BlockType GRASS_BLOCK = DummyObjectProvider.createFor(BlockType.class, "GRASS_BLOCK"); + public static final BlockType GRASS_PATH = DummyObjectProvider.createFor(BlockType.class, "GRASS_PATH"); public static final BlockType GRAVEL = DummyObjectProvider.createFor(BlockType.class, "GRAVEL"); + public static final BlockType GRAY_BANNER = DummyObjectProvider.createFor(BlockType.class, "GRAY_BANNER"); + + public static final BlockType GRAY_BED = DummyObjectProvider.createFor(BlockType.class, "GRAY_BED"); + + public static final BlockType GRAY_CARPET = DummyObjectProvider.createFor(BlockType.class, "GRAY_CARPET"); + + public static final BlockType GRAY_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "GRAY_CONCRETE"); + + public static final BlockType GRAY_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "GRAY_CONCRETE_POWDER"); + public static final BlockType GRAY_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "GRAY_GLAZED_TERRACOTTA"); public static final BlockType GRAY_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "GRAY_SHULKER_BOX"); + public static final BlockType GRAY_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "GRAY_STAINED_GLASS"); + + public static final BlockType GRAY_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "GRAY_STAINED_GLASS_PANE"); + + public static final BlockType GRAY_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "GRAY_TERRACOTTA"); + + public static final BlockType GRAY_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "GRAY_WALL_BANNER"); + + public static final BlockType GRAY_WOOL = DummyObjectProvider.createFor(BlockType.class, "GRAY_WOOL"); + + public static final BlockType GREEN_BANNER = DummyObjectProvider.createFor(BlockType.class, "GREEN_BANNER"); + + public static final BlockType GREEN_BED = DummyObjectProvider.createFor(BlockType.class, "GREEN_BED"); + + public static final BlockType GREEN_CARPET = DummyObjectProvider.createFor(BlockType.class, "GREEN_CARPET"); + + public static final BlockType GREEN_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "GREEN_CONCRETE"); + + public static final BlockType GREEN_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "GREEN_CONCRETE_POWDER"); + public static final BlockType GREEN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "GREEN_GLAZED_TERRACOTTA"); public static final BlockType GREEN_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "GREEN_SHULKER_BOX"); - public static final BlockType HARDENED_CLAY = DummyObjectProvider.createFor(BlockType.class, "HARDENED_CLAY"); + public static final BlockType GREEN_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "GREEN_STAINED_GLASS"); + + public static final BlockType GREEN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "GREEN_STAINED_GLASS_PANE"); + + public static final BlockType GREEN_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "GREEN_TERRACOTTA"); + + public static final BlockType GREEN_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "GREEN_WALL_BANNER"); + + public static final BlockType GREEN_WOOL = DummyObjectProvider.createFor(BlockType.class, "GREEN_WOOL"); public static final BlockType HAY_BLOCK = DummyObjectProvider.createFor(BlockType.class, "HAY_BLOCK"); @@ -241,8 +527,28 @@ public final class BlockTypes { public static final BlockType HOPPER = DummyObjectProvider.createFor(BlockType.class, "HOPPER"); + public static final BlockType HORN_CORAL = DummyObjectProvider.createFor(BlockType.class, "HORN_CORAL"); + + public static final BlockType HORN_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "HORN_CORAL_BLOCK"); + + public static final BlockType HORN_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "HORN_CORAL_FAN"); + + public static final BlockType HORN_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "HORN_CORAL_WALL_FAN"); + public static final BlockType ICE = DummyObjectProvider.createFor(BlockType.class, "ICE"); + public static final BlockType INFESTED_CHISELED_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "INFESTED_CHISELED_STONE_BRICKS"); + + public static final BlockType INFESTED_COBBLESTONE = DummyObjectProvider.createFor(BlockType.class, "INFESTED_COBBLESTONE"); + + public static final BlockType INFESTED_CRACKED_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "INFESTED_CRACKED_STONE_BRICKS"); + + public static final BlockType INFESTED_MOSSY_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "INFESTED_MOSSY_STONE_BRICKS"); + + public static final BlockType INFESTED_STONE = DummyObjectProvider.createFor(BlockType.class, "INFESTED_STONE"); + + public static final BlockType INFESTED_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "INFESTED_STONE_BRICKS"); + public static final BlockType IRON_BARS = DummyObjectProvider.createFor(BlockType.class, "IRON_BARS"); public static final BlockType IRON_BLOCK = DummyObjectProvider.createFor(BlockType.class, "IRON_BLOCK"); @@ -253,129 +559,387 @@ public final class BlockTypes { public static final BlockType IRON_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "IRON_TRAPDOOR"); + public static final BlockType JACK_O_LANTERN = DummyObjectProvider.createFor(BlockType.class, "JACK_O_LANTERN"); + public static final BlockType JUKEBOX = DummyObjectProvider.createFor(BlockType.class, "JUKEBOX"); + public static final BlockType JUNGLE_BUTTON = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_BUTTON"); + public static final BlockType JUNGLE_DOOR = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_DOOR"); public static final BlockType JUNGLE_FENCE = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_FENCE"); public static final BlockType JUNGLE_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_FENCE_GATE"); + public static final BlockType JUNGLE_LEAVES = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_LEAVES"); + + public static final BlockType JUNGLE_LOG = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_LOG"); + + public static final BlockType JUNGLE_PLANKS = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_PLANKS"); + + public static final BlockType JUNGLE_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_PRESSURE_PLATE"); + + public static final BlockType JUNGLE_SAPLING = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_SAPLING"); + + public static final BlockType JUNGLE_SLAB = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_SLAB"); + public static final BlockType JUNGLE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_STAIRS"); + public static final BlockType JUNGLE_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_TRAPDOOR"); + + public static final BlockType JUNGLE_WOOD = DummyObjectProvider.createFor(BlockType.class, "JUNGLE_WOOD"); + + public static final BlockType KELP = DummyObjectProvider.createFor(BlockType.class, "KELP"); + + public static final BlockType KELP_PLANT = DummyObjectProvider.createFor(BlockType.class, "KELP_PLANT"); + public static final BlockType LADDER = DummyObjectProvider.createFor(BlockType.class, "LADDER"); public static final BlockType LAPIS_BLOCK = DummyObjectProvider.createFor(BlockType.class, "LAPIS_BLOCK"); public static final BlockType LAPIS_ORE = DummyObjectProvider.createFor(BlockType.class, "LAPIS_ORE"); + public static final BlockType LARGE_FERN = DummyObjectProvider.createFor(BlockType.class, "LARGE_FERN"); + public static final BlockType LAVA = DummyObjectProvider.createFor(BlockType.class, "LAVA"); - public static final BlockType LEAVES = DummyObjectProvider.createFor(BlockType.class, "LEAVES"); + public static final BlockType LEVER = DummyObjectProvider.createFor(BlockType.class, "LEVER"); - public static final BlockType LEAVES2 = DummyObjectProvider.createFor(BlockType.class, "LEAVES2"); + public static final BlockType LIGHT_BLUE_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_BANNER"); - public static final BlockType LEVER = DummyObjectProvider.createFor(BlockType.class, "LEVER"); + public static final BlockType LIGHT_BLUE_BED = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_BED"); + + public static final BlockType LIGHT_BLUE_CARPET = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_CARPET"); + + public static final BlockType LIGHT_BLUE_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_CONCRETE"); + + public static final BlockType LIGHT_BLUE_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_CONCRETE_POWDER"); public static final BlockType LIGHT_BLUE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_GLAZED_TERRACOTTA"); public static final BlockType LIGHT_BLUE_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_SHULKER_BOX"); + public static final BlockType LIGHT_BLUE_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_STAINED_GLASS"); + + public static final BlockType LIGHT_BLUE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_STAINED_GLASS_PANE"); + + public static final BlockType LIGHT_BLUE_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_TERRACOTTA"); + + public static final BlockType LIGHT_BLUE_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_WALL_BANNER"); + + public static final BlockType LIGHT_BLUE_WOOL = DummyObjectProvider.createFor(BlockType.class, "LIGHT_BLUE_WOOL"); + + public static final BlockType LIGHT_GRAY_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_BANNER"); + + public static final BlockType LIGHT_GRAY_BED = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_BED"); + + public static final BlockType LIGHT_GRAY_CARPET = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_CARPET"); + + public static final BlockType LIGHT_GRAY_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_CONCRETE"); + + public static final BlockType LIGHT_GRAY_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_CONCRETE_POWDER"); + + public static final BlockType LIGHT_GRAY_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_GLAZED_TERRACOTTA"); + + public static final BlockType LIGHT_GRAY_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_SHULKER_BOX"); + + public static final BlockType LIGHT_GRAY_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_STAINED_GLASS"); + + public static final BlockType LIGHT_GRAY_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_STAINED_GLASS_PANE"); + + public static final BlockType LIGHT_GRAY_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_TERRACOTTA"); + + public static final BlockType LIGHT_GRAY_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_WALL_BANNER"); + + public static final BlockType LIGHT_GRAY_WOOL = DummyObjectProvider.createFor(BlockType.class, "LIGHT_GRAY_WOOL"); + public static final BlockType LIGHT_WEIGHTED_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "LIGHT_WEIGHTED_PRESSURE_PLATE"); + public static final BlockType LILAC = DummyObjectProvider.createFor(BlockType.class, "LILAC"); + + public static final BlockType LILY_PAD = DummyObjectProvider.createFor(BlockType.class, "LILY_PAD"); + + public static final BlockType LIME_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIME_BANNER"); + + public static final BlockType LIME_BED = DummyObjectProvider.createFor(BlockType.class, "LIME_BED"); + + public static final BlockType LIME_CARPET = DummyObjectProvider.createFor(BlockType.class, "LIME_CARPET"); + + public static final BlockType LIME_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "LIME_CONCRETE"); + + public static final BlockType LIME_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "LIME_CONCRETE_POWDER"); + public static final BlockType LIME_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIME_GLAZED_TERRACOTTA"); public static final BlockType LIME_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "LIME_SHULKER_BOX"); - public static final BlockType LIT_FURNACE = DummyObjectProvider.createFor(BlockType.class, "LIT_FURNACE"); + public static final BlockType LIME_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "LIME_STAINED_GLASS"); + + public static final BlockType LIME_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "LIME_STAINED_GLASS_PANE"); + + public static final BlockType LIME_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "LIME_TERRACOTTA"); - public static final BlockType LIT_PUMPKIN = DummyObjectProvider.createFor(BlockType.class, "LIT_PUMPKIN"); + public static final BlockType LIME_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "LIME_WALL_BANNER"); - public static final BlockType LIT_REDSTONE_LAMP = DummyObjectProvider.createFor(BlockType.class, "LIT_REDSTONE_LAMP"); + public static final BlockType LIME_WOOL = DummyObjectProvider.createFor(BlockType.class, "LIME_WOOL"); - public static final BlockType LIT_REDSTONE_ORE = DummyObjectProvider.createFor(BlockType.class, "LIT_REDSTONE_ORE"); + public static final BlockType MAGENTA_BANNER = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_BANNER"); - public static final BlockType LOG = DummyObjectProvider.createFor(BlockType.class, "LOG"); + public static final BlockType MAGENTA_BED = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_BED"); - public static final BlockType LOG2 = DummyObjectProvider.createFor(BlockType.class, "LOG2"); + public static final BlockType MAGENTA_CARPET = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_CARPET"); + + public static final BlockType MAGENTA_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_CONCRETE"); + + public static final BlockType MAGENTA_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_CONCRETE_POWDER"); public static final BlockType MAGENTA_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_GLAZED_TERRACOTTA"); public static final BlockType MAGENTA_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_SHULKER_BOX"); - public static final BlockType MAGMA = DummyObjectProvider.createFor(BlockType.class, "MAGMA"); + public static final BlockType MAGENTA_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_STAINED_GLASS"); - public static final BlockType MELON_BLOCK = DummyObjectProvider.createFor(BlockType.class, "MELON_BLOCK"); + public static final BlockType MAGENTA_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_STAINED_GLASS_PANE"); - public static final BlockType MELON_STEM = DummyObjectProvider.createFor(BlockType.class, "MELON_STEM"); + public static final BlockType MAGENTA_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_TERRACOTTA"); + + public static final BlockType MAGENTA_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_WALL_BANNER"); + + public static final BlockType MAGENTA_WOOL = DummyObjectProvider.createFor(BlockType.class, "MAGENTA_WOOL"); + + public static final BlockType MAGMA_BLOCK = DummyObjectProvider.createFor(BlockType.class, "MAGMA_BLOCK"); - public static final BlockType MOB_SPAWNER = DummyObjectProvider.createFor(BlockType.class, "MOB_SPAWNER"); + public static final BlockType MELON = DummyObjectProvider.createFor(BlockType.class, "MELON"); - public static final BlockType MONSTER_EGG = DummyObjectProvider.createFor(BlockType.class, "MONSTER_EGG"); + public static final BlockType MELON_STEM = DummyObjectProvider.createFor(BlockType.class, "MELON_STEM"); public static final BlockType MOSSY_COBBLESTONE = DummyObjectProvider.createFor(BlockType.class, "MOSSY_COBBLESTONE"); - public static final BlockType MYCELIUM = DummyObjectProvider.createFor(BlockType.class, "MYCELIUM"); + public static final BlockType MOSSY_COBBLESTONE_WALL = DummyObjectProvider.createFor(BlockType.class, "MOSSY_COBBLESTONE_WALL"); - public static final BlockType NETHERRACK = DummyObjectProvider.createFor(BlockType.class, "NETHERRACK"); + public static final BlockType MOSSY_STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "MOSSY_STONE_BRICKS"); + + public static final BlockType MOVING_PISTON = DummyObjectProvider.createFor(BlockType.class, "MOVING_PISTON"); - public static final BlockType NETHER_BRICK = DummyObjectProvider.createFor(BlockType.class, "NETHER_BRICK"); + public static final BlockType MUSHROOM_STEM = DummyObjectProvider.createFor(BlockType.class, "MUSHROOM_STEM"); + + public static final BlockType MYCELIUM = DummyObjectProvider.createFor(BlockType.class, "MYCELIUM"); public static final BlockType NETHER_BRICK_FENCE = DummyObjectProvider.createFor(BlockType.class, "NETHER_BRICK_FENCE"); + public static final BlockType NETHER_BRICK_SLAB = DummyObjectProvider.createFor(BlockType.class, "NETHER_BRICK_SLAB"); + public static final BlockType NETHER_BRICK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "NETHER_BRICK_STAIRS"); + public static final BlockType NETHER_BRICKS = DummyObjectProvider.createFor(BlockType.class, "NETHER_BRICKS"); + + public static final BlockType NETHER_PORTAL = DummyObjectProvider.createFor(BlockType.class, "NETHER_PORTAL"); + + public static final BlockType NETHER_QUARTZ_ORE = DummyObjectProvider.createFor(BlockType.class, "NETHER_QUARTZ_ORE"); + public static final BlockType NETHER_WART = DummyObjectProvider.createFor(BlockType.class, "NETHER_WART"); public static final BlockType NETHER_WART_BLOCK = DummyObjectProvider.createFor(BlockType.class, "NETHER_WART_BLOCK"); - public static final BlockType NOTEBLOCK = DummyObjectProvider.createFor(BlockType.class, "NOTEBLOCK"); + public static final BlockType NETHERRACK = DummyObjectProvider.createFor(BlockType.class, "NETHERRACK"); + + public static final BlockType NOTE_BLOCK = DummyObjectProvider.createFor(BlockType.class, "NOTE_BLOCK"); + + public static final BlockType OAK_BUTTON = DummyObjectProvider.createFor(BlockType.class, "OAK_BUTTON"); + + public static final BlockType OAK_DOOR = DummyObjectProvider.createFor(BlockType.class, "OAK_DOOR"); + + public static final BlockType OAK_FENCE = DummyObjectProvider.createFor(BlockType.class, "OAK_FENCE"); + + public static final BlockType OAK_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "OAK_FENCE_GATE"); + + public static final BlockType OAK_LEAVES = DummyObjectProvider.createFor(BlockType.class, "OAK_LEAVES"); + + public static final BlockType OAK_LOG = DummyObjectProvider.createFor(BlockType.class, "OAK_LOG"); + + public static final BlockType OAK_PLANKS = DummyObjectProvider.createFor(BlockType.class, "OAK_PLANKS"); + + public static final BlockType OAK_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "OAK_PRESSURE_PLATE"); + + public static final BlockType OAK_SAPLING = DummyObjectProvider.createFor(BlockType.class, "OAK_SAPLING"); + + public static final BlockType OAK_SLAB = DummyObjectProvider.createFor(BlockType.class, "OAK_SLAB"); public static final BlockType OAK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "OAK_STAIRS"); + public static final BlockType OAK_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "OAK_TRAPDOOR"); + + public static final BlockType OAK_WOOD = DummyObjectProvider.createFor(BlockType.class, "OAK_WOOD"); + public static final BlockType OBSERVER = DummyObjectProvider.createFor(BlockType.class, "OBSERVER"); public static final BlockType OBSIDIAN = DummyObjectProvider.createFor(BlockType.class, "OBSIDIAN"); + public static final BlockType ORANGE_BANNER = DummyObjectProvider.createFor(BlockType.class, "ORANGE_BANNER"); + + public static final BlockType ORANGE_BED = DummyObjectProvider.createFor(BlockType.class, "ORANGE_BED"); + + public static final BlockType ORANGE_CARPET = DummyObjectProvider.createFor(BlockType.class, "ORANGE_CARPET"); + + public static final BlockType ORANGE_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "ORANGE_CONCRETE"); + + public static final BlockType ORANGE_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "ORANGE_CONCRETE_POWDER"); + public static final BlockType ORANGE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "ORANGE_GLAZED_TERRACOTTA"); public static final BlockType ORANGE_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "ORANGE_SHULKER_BOX"); + public static final BlockType ORANGE_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "ORANGE_STAINED_GLASS"); + + public static final BlockType ORANGE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "ORANGE_STAINED_GLASS_PANE"); + + public static final BlockType ORANGE_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "ORANGE_TERRACOTTA"); + + public static final BlockType ORANGE_TULIP = DummyObjectProvider.createFor(BlockType.class, "ORANGE_TULIP"); + + public static final BlockType ORANGE_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "ORANGE_WALL_BANNER"); + + public static final BlockType ORANGE_WOOL = DummyObjectProvider.createFor(BlockType.class, "ORANGE_WOOL"); + + public static final BlockType OXEYE_DAISY = DummyObjectProvider.createFor(BlockType.class, "OXEYE_DAISY"); + public static final BlockType PACKED_ICE = DummyObjectProvider.createFor(BlockType.class, "PACKED_ICE"); + public static final BlockType PEONY = DummyObjectProvider.createFor(BlockType.class, "PEONY"); + + public static final BlockType PETRIFIED_OAK_SLAB = DummyObjectProvider.createFor(BlockType.class, "PETRIFIED_OAK_SLAB"); + + public static final BlockType PINK_BANNER = DummyObjectProvider.createFor(BlockType.class, "PINK_BANNER"); + + public static final BlockType PINK_BED = DummyObjectProvider.createFor(BlockType.class, "PINK_BED"); + + public static final BlockType PINK_CARPET = DummyObjectProvider.createFor(BlockType.class, "PINK_CARPET"); + + public static final BlockType PINK_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "PINK_CONCRETE"); + + public static final BlockType PINK_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "PINK_CONCRETE_POWDER"); + public static final BlockType PINK_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "PINK_GLAZED_TERRACOTTA"); public static final BlockType PINK_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "PINK_SHULKER_BOX"); - public static final BlockType PISTON = DummyObjectProvider.createFor(BlockType.class, "PISTON"); + public static final BlockType PINK_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "PINK_STAINED_GLASS"); - public static final BlockType PISTON_EXTENSION = DummyObjectProvider.createFor(BlockType.class, "PISTON_EXTENSION"); + public static final BlockType PINK_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "PINK_STAINED_GLASS_PANE"); + + public static final BlockType PINK_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "PINK_TERRACOTTA"); + + public static final BlockType PINK_TULIP = DummyObjectProvider.createFor(BlockType.class, "PINK_TULIP"); + + public static final BlockType PINK_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "PINK_WALL_BANNER"); + + public static final BlockType PINK_WOOL = DummyObjectProvider.createFor(BlockType.class, "PINK_WOOL"); + + public static final BlockType PISTON = DummyObjectProvider.createFor(BlockType.class, "PISTON"); public static final BlockType PISTON_HEAD = DummyObjectProvider.createFor(BlockType.class, "PISTON_HEAD"); - public static final BlockType PLANKS = DummyObjectProvider.createFor(BlockType.class, "PLANKS"); + public static final BlockType PLAYER_HEAD = DummyObjectProvider.createFor(BlockType.class, "PLAYER_HEAD"); - public static final BlockType PORTAL = DummyObjectProvider.createFor(BlockType.class, "PORTAL"); + public static final BlockType PLAYER_WALL_HEAD = DummyObjectProvider.createFor(BlockType.class, "PLAYER_WALL_HEAD"); + + public static final BlockType PODZOL = DummyObjectProvider.createFor(BlockType.class, "PODZOL"); + + public static final BlockType POLISHED_ANDESITE = DummyObjectProvider.createFor(BlockType.class, "POLISHED_ANDESITE"); + + public static final BlockType POLISHED_DIORITE = DummyObjectProvider.createFor(BlockType.class, "POLISHED_DIORITE"); + + public static final BlockType POLISHED_GRANITE = DummyObjectProvider.createFor(BlockType.class, "POLISHED_GRANITE"); + + public static final BlockType POPPY = DummyObjectProvider.createFor(BlockType.class, "POPPY"); public static final BlockType POTATOES = DummyObjectProvider.createFor(BlockType.class, "POTATOES"); - public static final BlockType POWERED_COMPARATOR = DummyObjectProvider.createFor(BlockType.class, "POWERED_COMPARATOR"); + public static final BlockType POTTED_ACACIA_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_ACACIA_SAPLING"); + + public static final BlockType POTTED_ALLIUM = DummyObjectProvider.createFor(BlockType.class, "POTTED_ALLIUM"); + + public static final BlockType POTTED_AZURE_BLUET = DummyObjectProvider.createFor(BlockType.class, "POTTED_AZURE_BLUET"); + + public static final BlockType POTTED_BIRCH_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_BIRCH_SAPLING"); + + public static final BlockType POTTED_BLUE_ORCHID = DummyObjectProvider.createFor(BlockType.class, "POTTED_BLUE_ORCHID"); + + public static final BlockType POTTED_BROWN_MUSHROOM = DummyObjectProvider.createFor(BlockType.class, "POTTED_BROWN_MUSHROOM"); + + public static final BlockType POTTED_CACTUS = DummyObjectProvider.createFor(BlockType.class, "POTTED_CACTUS"); + + public static final BlockType POTTED_DANDELION = DummyObjectProvider.createFor(BlockType.class, "POTTED_DANDELION"); + + public static final BlockType POTTED_DARK_OAK_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_DARK_OAK_SAPLING"); + + public static final BlockType POTTED_DEAD_BUSH = DummyObjectProvider.createFor(BlockType.class, "POTTED_DEAD_BUSH"); + + public static final BlockType POTTED_FERN = DummyObjectProvider.createFor(BlockType.class, "POTTED_FERN"); + + public static final BlockType POTTED_JUNGLE_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_JUNGLE_SAPLING"); + + public static final BlockType POTTED_OAK_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_OAK_SAPLING"); + + public static final BlockType POTTED_ORANGE_TULIP = DummyObjectProvider.createFor(BlockType.class, "POTTED_ORANGE_TULIP"); + + public static final BlockType POTTED_OXEYE_DAISY = DummyObjectProvider.createFor(BlockType.class, "POTTED_OXEYE_DAISY"); + + public static final BlockType POTTED_PINK_TULIP = DummyObjectProvider.createFor(BlockType.class, "POTTED_PINK_TULIP"); + + public static final BlockType POTTED_POPPY = DummyObjectProvider.createFor(BlockType.class, "POTTED_POPPY"); + + public static final BlockType POTTED_RED_MUSHROOM = DummyObjectProvider.createFor(BlockType.class, "POTTED_RED_MUSHROOM"); + + public static final BlockType POTTED_RED_TULIP = DummyObjectProvider.createFor(BlockType.class, "POTTED_RED_TULIP"); + + public static final BlockType POTTED_SPRUCE_SAPLING = DummyObjectProvider.createFor(BlockType.class, "POTTED_SPRUCE_SAPLING"); - public static final BlockType POWERED_REPEATER = DummyObjectProvider.createFor(BlockType.class, "POWERED_REPEATER"); + public static final BlockType POTTED_WHITE_TULIP = DummyObjectProvider.createFor(BlockType.class, "POTTED_WHITE_TULIP"); + + public static final BlockType POWERED_RAIL = DummyObjectProvider.createFor(BlockType.class, "POWERED_RAIL"); public static final BlockType PRISMARINE = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE"); + public static final BlockType PRISMARINE_BRICK_SLAB = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE_BRICK_SLAB"); + + public static final BlockType PRISMARINE_BRICK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE_BRICK_STAIRS"); + + public static final BlockType PRISMARINE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE_BRICKS"); + + public static final BlockType PRISMARINE_SLAB = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE_SLAB"); + + public static final BlockType PRISMARINE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "PRISMARINE_STAIRS"); + public static final BlockType PUMPKIN = DummyObjectProvider.createFor(BlockType.class, "PUMPKIN"); public static final BlockType PUMPKIN_STEM = DummyObjectProvider.createFor(BlockType.class, "PUMPKIN_STEM"); + public static final BlockType PURPLE_BANNER = DummyObjectProvider.createFor(BlockType.class, "PURPLE_BANNER"); + + public static final BlockType PURPLE_BED = DummyObjectProvider.createFor(BlockType.class, "PURPLE_BED"); + + public static final BlockType PURPLE_CARPET = DummyObjectProvider.createFor(BlockType.class, "PURPLE_CARPET"); + + public static final BlockType PURPLE_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "PURPLE_CONCRETE"); + + public static final BlockType PURPLE_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "PURPLE_CONCRETE_POWDER"); + public static final BlockType PURPLE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "PURPLE_GLAZED_TERRACOTTA"); public static final BlockType PURPLE_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "PURPLE_SHULKER_BOX"); - public static final BlockType PURPUR_BLOCK = DummyObjectProvider.createFor(BlockType.class, "PURPUR_BLOCK"); + public static final BlockType PURPLE_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "PURPLE_STAINED_GLASS"); + + public static final BlockType PURPLE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "PURPLE_STAINED_GLASS_PANE"); - public static final BlockType PURPUR_DOUBLE_SLAB = DummyObjectProvider.createFor(BlockType.class, "PURPUR_DOUBLE_SLAB"); + public static final BlockType PURPLE_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "PURPLE_TERRACOTTA"); + + public static final BlockType PURPLE_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "PURPLE_WALL_BANNER"); + + public static final BlockType PURPLE_WOOL = DummyObjectProvider.createFor(BlockType.class, "PURPLE_WOOL"); + + public static final BlockType PURPUR_BLOCK = DummyObjectProvider.createFor(BlockType.class, "PURPUR_BLOCK"); public static final BlockType PURPUR_PILLAR = DummyObjectProvider.createFor(BlockType.class, "PURPUR_PILLAR"); @@ -385,23 +949,23 @@ public final class BlockTypes { public static final BlockType QUARTZ_BLOCK = DummyObjectProvider.createFor(BlockType.class, "QUARTZ_BLOCK"); - public static final BlockType QUARTZ_ORE = DummyObjectProvider.createFor(BlockType.class, "QUARTZ_ORE"); + public static final BlockType QUARTZ_PILLAR = DummyObjectProvider.createFor(BlockType.class, "QUARTZ_PILLAR"); + + public static final BlockType QUARTZ_SLAB = DummyObjectProvider.createFor(BlockType.class, "QUARTZ_SLAB"); public static final BlockType QUARTZ_STAIRS = DummyObjectProvider.createFor(BlockType.class, "QUARTZ_STAIRS"); public static final BlockType RAIL = DummyObjectProvider.createFor(BlockType.class, "RAIL"); - public static final BlockType REDSTONE_BLOCK = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_BLOCK"); - - public static final BlockType REDSTONE_LAMP = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_LAMP"); + public static final BlockType RED_BANNER = DummyObjectProvider.createFor(BlockType.class, "RED_BANNER"); - public static final BlockType REDSTONE_ORE = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_ORE"); + public static final BlockType RED_BED = DummyObjectProvider.createFor(BlockType.class, "RED_BED"); - public static final BlockType REDSTONE_TORCH = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_TORCH"); + public static final BlockType RED_CARPET = DummyObjectProvider.createFor(BlockType.class, "RED_CARPET"); - public static final BlockType REDSTONE_WIRE = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_WIRE"); + public static final BlockType RED_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "RED_CONCRETE"); - public static final BlockType RED_FLOWER = DummyObjectProvider.createFor(BlockType.class, "RED_FLOWER"); + public static final BlockType RED_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "RED_CONCRETE_POWDER"); public static final BlockType RED_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "RED_GLAZED_TERRACOTTA"); @@ -409,138 +973,262 @@ public final class BlockTypes { public static final BlockType RED_MUSHROOM_BLOCK = DummyObjectProvider.createFor(BlockType.class, "RED_MUSHROOM_BLOCK"); - public static final BlockType RED_NETHER_BRICK = DummyObjectProvider.createFor(BlockType.class, "RED_NETHER_BRICK"); + public static final BlockType RED_NETHER_BRICKS = DummyObjectProvider.createFor(BlockType.class, "RED_NETHER_BRICKS"); + + public static final BlockType RED_SAND = DummyObjectProvider.createFor(BlockType.class, "RED_SAND"); public static final BlockType RED_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "RED_SANDSTONE"); + public static final BlockType RED_SANDSTONE_SLAB = DummyObjectProvider.createFor(BlockType.class, "RED_SANDSTONE_SLAB"); + public static final BlockType RED_SANDSTONE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "RED_SANDSTONE_STAIRS"); public static final BlockType RED_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "RED_SHULKER_BOX"); - public static final BlockType REEDS = DummyObjectProvider.createFor(BlockType.class, "REEDS"); + public static final BlockType RED_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "RED_STAINED_GLASS"); + + public static final BlockType RED_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "RED_STAINED_GLASS_PANE"); + + public static final BlockType RED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "RED_TERRACOTTA"); + + public static final BlockType RED_TULIP = DummyObjectProvider.createFor(BlockType.class, "RED_TULIP"); + + public static final BlockType RED_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "RED_WALL_BANNER"); + + public static final BlockType RED_WOOL = DummyObjectProvider.createFor(BlockType.class, "RED_WOOL"); + + public static final BlockType REDSTONE_BLOCK = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_BLOCK"); + + public static final BlockType REDSTONE_LAMP = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_LAMP"); + + public static final BlockType REDSTONE_ORE = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_ORE"); + + public static final BlockType REDSTONE_TORCH = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_TORCH"); + + public static final BlockType REDSTONE_WALL_TORCH = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_WALL_TORCH"); + + public static final BlockType REDSTONE_WIRE = DummyObjectProvider.createFor(BlockType.class, "REDSTONE_WIRE"); + + public static final BlockType REPEATER = DummyObjectProvider.createFor(BlockType.class, "REPEATER"); public static final BlockType REPEATING_COMMAND_BLOCK = DummyObjectProvider.createFor(BlockType.class, "REPEATING_COMMAND_BLOCK"); + public static final BlockType ROSE_BUSH = DummyObjectProvider.createFor(BlockType.class, "ROSE_BUSH"); + public static final BlockType SAND = DummyObjectProvider.createFor(BlockType.class, "SAND"); public static final BlockType SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "SANDSTONE"); - public static final BlockType SANDSTONE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "SANDSTONE_STAIRS"); + public static final BlockType SANDSTONE_SLAB = DummyObjectProvider.createFor(BlockType.class, "SANDSTONE_SLAB"); - public static final BlockType SAPLING = DummyObjectProvider.createFor(BlockType.class, "SAPLING"); + public static final BlockType SANDSTONE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "SANDSTONE_STAIRS"); public static final BlockType SEA_LANTERN = DummyObjectProvider.createFor(BlockType.class, "SEA_LANTERN"); - public static final BlockType SILVER_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "SILVER_GLAZED_TERRACOTTA"); + public static final BlockType SEA_PICKLE = DummyObjectProvider.createFor(BlockType.class, "SEA_PICKLE"); + + public static final BlockType SEAGRASS = DummyObjectProvider.createFor(BlockType.class, "SEAGRASS"); + + public static final BlockType SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "SHULKER_BOX"); + + public static final BlockType SIGN = DummyObjectProvider.createFor(BlockType.class, "SIGN"); + + public static final BlockType SKELETON_SKULL = DummyObjectProvider.createFor(BlockType.class, "SKELETON_SKULL"); - public static final BlockType SILVER_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "SILVER_SHULKER_BOX"); + public static final BlockType SKELETON_WALL_SKULL = DummyObjectProvider.createFor(BlockType.class, "SKELETON_WALL_SKULL"); - public static final BlockType SKULL = DummyObjectProvider.createFor(BlockType.class, "SKULL"); + public static final BlockType SLIME_BLOCK = DummyObjectProvider.createFor(BlockType.class, "SLIME_BLOCK"); - public static final BlockType SLIME = DummyObjectProvider.createFor(BlockType.class, "SLIME"); + public static final BlockType SMOOTH_QUARTZ = DummyObjectProvider.createFor(BlockType.class, "SMOOTH_QUARTZ"); + + public static final BlockType SMOOTH_RED_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "SMOOTH_RED_SANDSTONE"); + + public static final BlockType SMOOTH_SANDSTONE = DummyObjectProvider.createFor(BlockType.class, "SMOOTH_SANDSTONE"); + + public static final BlockType SMOOTH_STONE = DummyObjectProvider.createFor(BlockType.class, "SMOOTH_STONE"); public static final BlockType SNOW = DummyObjectProvider.createFor(BlockType.class, "SNOW"); - public static final BlockType SNOW_LAYER = DummyObjectProvider.createFor(BlockType.class, "SNOW_LAYER"); + public static final BlockType SNOW_BLOCK = DummyObjectProvider.createFor(BlockType.class, "SNOW_BLOCK"); public static final BlockType SOUL_SAND = DummyObjectProvider.createFor(BlockType.class, "SOUL_SAND"); + public static final BlockType SPAWNER = DummyObjectProvider.createFor(BlockType.class, "SPAWNER"); + public static final BlockType SPONGE = DummyObjectProvider.createFor(BlockType.class, "SPONGE"); + public static final BlockType SPRUCE_BUTTON = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_BUTTON"); + public static final BlockType SPRUCE_DOOR = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_DOOR"); public static final BlockType SPRUCE_FENCE = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_FENCE"); public static final BlockType SPRUCE_FENCE_GATE = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_FENCE_GATE"); - public static final BlockType SPRUCE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_STAIRS"); + public static final BlockType SPRUCE_LEAVES = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_LEAVES"); - public static final BlockType STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "STAINED_GLASS"); + public static final BlockType SPRUCE_LOG = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_LOG"); - public static final BlockType STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "STAINED_GLASS_PANE"); + public static final BlockType SPRUCE_PLANKS = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_PLANKS"); - public static final BlockType STAINED_HARDENED_CLAY = DummyObjectProvider.createFor(BlockType.class, "STAINED_HARDENED_CLAY"); + public static final BlockType SPRUCE_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_PRESSURE_PLATE"); - public static final BlockType STANDING_BANNER = DummyObjectProvider.createFor(BlockType.class, "STANDING_BANNER"); + public static final BlockType SPRUCE_SAPLING = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_SAPLING"); - public static final BlockType STANDING_SIGN = DummyObjectProvider.createFor(BlockType.class, "STANDING_SIGN"); + public static final BlockType SPRUCE_SLAB = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_SLAB"); + + public static final BlockType SPRUCE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_STAIRS"); + + public static final BlockType SPRUCE_TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_TRAPDOOR"); + + public static final BlockType SPRUCE_WOOD = DummyObjectProvider.createFor(BlockType.class, "SPRUCE_WOOD"); public static final BlockType STICKY_PISTON = DummyObjectProvider.createFor(BlockType.class, "STICKY_PISTON"); public static final BlockType STONE = DummyObjectProvider.createFor(BlockType.class, "STONE"); - public static final BlockType STONEBRICK = DummyObjectProvider.createFor(BlockType.class, "STONEBRICK"); + public static final BlockType STONE_BRICK_SLAB = DummyObjectProvider.createFor(BlockType.class, "STONE_BRICK_SLAB"); public static final BlockType STONE_BRICK_STAIRS = DummyObjectProvider.createFor(BlockType.class, "STONE_BRICK_STAIRS"); + public static final BlockType STONE_BRICKS = DummyObjectProvider.createFor(BlockType.class, "STONE_BRICKS"); + public static final BlockType STONE_BUTTON = DummyObjectProvider.createFor(BlockType.class, "STONE_BUTTON"); public static final BlockType STONE_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "STONE_PRESSURE_PLATE"); public static final BlockType STONE_SLAB = DummyObjectProvider.createFor(BlockType.class, "STONE_SLAB"); - public static final BlockType STONE_SLAB2 = DummyObjectProvider.createFor(BlockType.class, "STONE_SLAB2"); + public static final BlockType STRIPPED_ACACIA_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_ACACIA_LOG"); + + public static final BlockType STRIPPED_ACACIA_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_ACACIA_WOOD"); + + public static final BlockType STRIPPED_BIRCH_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_BIRCH_LOG"); - public static final BlockType STONE_STAIRS = DummyObjectProvider.createFor(BlockType.class, "STONE_STAIRS"); + public static final BlockType STRIPPED_BIRCH_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_BIRCH_WOOD"); + + public static final BlockType STRIPPED_DARK_OAK_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_DARK_OAK_LOG"); + + public static final BlockType STRIPPED_DARK_OAK_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_DARK_OAK_WOOD"); + + public static final BlockType STRIPPED_JUNGLE_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_JUNGLE_LOG"); + + public static final BlockType STRIPPED_JUNGLE_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_JUNGLE_WOOD"); + + public static final BlockType STRIPPED_OAK_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_OAK_LOG"); + + public static final BlockType STRIPPED_OAK_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_OAK_WOOD"); + + public static final BlockType STRIPPED_SPRUCE_LOG = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_SPRUCE_LOG"); + + public static final BlockType STRIPPED_SPRUCE_WOOD = DummyObjectProvider.createFor(BlockType.class, "STRIPPED_SPRUCE_WOOD"); public static final BlockType STRUCTURE_BLOCK = DummyObjectProvider.createFor(BlockType.class, "STRUCTURE_BLOCK"); public static final BlockType STRUCTURE_VOID = DummyObjectProvider.createFor(BlockType.class, "STRUCTURE_VOID"); - public static final BlockType TALLGRASS = DummyObjectProvider.createFor(BlockType.class, "TALLGRASS"); + public static final BlockType SUGAR_CANE = DummyObjectProvider.createFor(BlockType.class, "SUGAR_CANE"); + + public static final BlockType SUNFLOWER = DummyObjectProvider.createFor(BlockType.class, "SUNFLOWER"); + + public static final BlockType TALL_GRASS = DummyObjectProvider.createFor(BlockType.class, "TALL_GRASS"); + + public static final BlockType TALL_SEAGRASS = DummyObjectProvider.createFor(BlockType.class, "TALL_SEAGRASS"); + + public static final BlockType TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "TERRACOTTA"); public static final BlockType TNT = DummyObjectProvider.createFor(BlockType.class, "TNT"); public static final BlockType TORCH = DummyObjectProvider.createFor(BlockType.class, "TORCH"); - public static final BlockType TRAPDOOR = DummyObjectProvider.createFor(BlockType.class, "TRAPDOOR"); - public static final BlockType TRAPPED_CHEST = DummyObjectProvider.createFor(BlockType.class, "TRAPPED_CHEST"); public static final BlockType TRIPWIRE = DummyObjectProvider.createFor(BlockType.class, "TRIPWIRE"); public static final BlockType TRIPWIRE_HOOK = DummyObjectProvider.createFor(BlockType.class, "TRIPWIRE_HOOK"); - public static final BlockType UNLIT_REDSTONE_TORCH = DummyObjectProvider.createFor(BlockType.class, "UNLIT_REDSTONE_TORCH"); + public static final BlockType TUBE_CORAL = DummyObjectProvider.createFor(BlockType.class, "TUBE_CORAL"); + + public static final BlockType TUBE_CORAL_BLOCK = DummyObjectProvider.createFor(BlockType.class, "TUBE_CORAL_BLOCK"); + + public static final BlockType TUBE_CORAL_FAN = DummyObjectProvider.createFor(BlockType.class, "TUBE_CORAL_FAN"); - public static final BlockType UNPOWERED_COMPARATOR = DummyObjectProvider.createFor(BlockType.class, "UNPOWERED_COMPARATOR"); + public static final BlockType TUBE_CORAL_WALL_FAN = DummyObjectProvider.createFor(BlockType.class, "TUBE_CORAL_WALL_FAN"); - public static final BlockType UNPOWERED_REPEATER = DummyObjectProvider.createFor(BlockType.class, "UNPOWERED_REPEATER"); + public static final BlockType TURTLE_EGG = DummyObjectProvider.createFor(BlockType.class, "TURTLE_EGG"); public static final BlockType VINE = DummyObjectProvider.createFor(BlockType.class, "VINE"); - public static final BlockType WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "WALL_BANNER"); + public static final BlockType VOID_AIR = DummyObjectProvider.createFor(BlockType.class, "VOID_AIR"); public static final BlockType WALL_SIGN = DummyObjectProvider.createFor(BlockType.class, "WALL_SIGN"); - public static final BlockType WATER = DummyObjectProvider.createFor(BlockType.class, "WATER"); + public static final BlockType WALL_TORCH = DummyObjectProvider.createFor(BlockType.class, "WALL_TORCH"); - public static final BlockType WATERLILY = DummyObjectProvider.createFor(BlockType.class, "WATERLILY"); + public static final BlockType WATER = DummyObjectProvider.createFor(BlockType.class, "WATER"); - public static final BlockType WEB = DummyObjectProvider.createFor(BlockType.class, "WEB"); + public static final BlockType WET_SPONGE = DummyObjectProvider.createFor(BlockType.class, "WET_SPONGE"); public static final BlockType WHEAT = DummyObjectProvider.createFor(BlockType.class, "WHEAT"); + public static final BlockType WHITE_BANNER = DummyObjectProvider.createFor(BlockType.class, "WHITE_BANNER"); + + public static final BlockType WHITE_BED = DummyObjectProvider.createFor(BlockType.class, "WHITE_BED"); + + public static final BlockType WHITE_CARPET = DummyObjectProvider.createFor(BlockType.class, "WHITE_CARPET"); + + public static final BlockType WHITE_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "WHITE_CONCRETE"); + + public static final BlockType WHITE_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "WHITE_CONCRETE_POWDER"); + public static final BlockType WHITE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "WHITE_GLAZED_TERRACOTTA"); public static final BlockType WHITE_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "WHITE_SHULKER_BOX"); - public static final BlockType WOODEN_BUTTON = DummyObjectProvider.createFor(BlockType.class, "WOODEN_BUTTON"); + public static final BlockType WHITE_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "WHITE_STAINED_GLASS"); + + public static final BlockType WHITE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "WHITE_STAINED_GLASS_PANE"); + + public static final BlockType WHITE_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "WHITE_TERRACOTTA"); - public static final BlockType WOODEN_DOOR = DummyObjectProvider.createFor(BlockType.class, "WOODEN_DOOR"); + public static final BlockType WHITE_TULIP = DummyObjectProvider.createFor(BlockType.class, "WHITE_TULIP"); - public static final BlockType WOODEN_PRESSURE_PLATE = DummyObjectProvider.createFor(BlockType.class, "WOODEN_PRESSURE_PLATE"); + public static final BlockType WHITE_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "WHITE_WALL_BANNER"); - public static final BlockType WOODEN_SLAB = DummyObjectProvider.createFor(BlockType.class, "WOODEN_SLAB"); + public static final BlockType WHITE_WOOL = DummyObjectProvider.createFor(BlockType.class, "WHITE_WOOL"); - public static final BlockType WOOL = DummyObjectProvider.createFor(BlockType.class, "WOOL"); + public static final BlockType WITHER_SKELETON_SKULL = DummyObjectProvider.createFor(BlockType.class, "WITHER_SKELETON_SKULL"); - public static final BlockType YELLOW_FLOWER = DummyObjectProvider.createFor(BlockType.class, "YELLOW_FLOWER"); + public static final BlockType WITHER_SKELETON_WALL_SKULL = DummyObjectProvider.createFor(BlockType.class, "WITHER_SKELETON_WALL_SKULL"); + + public static final BlockType YELLOW_BANNER = DummyObjectProvider.createFor(BlockType.class, "YELLOW_BANNER"); + + public static final BlockType YELLOW_BED = DummyObjectProvider.createFor(BlockType.class, "YELLOW_BED"); + + public static final BlockType YELLOW_CARPET = DummyObjectProvider.createFor(BlockType.class, "YELLOW_CARPET"); + + public static final BlockType YELLOW_CONCRETE = DummyObjectProvider.createFor(BlockType.class, "YELLOW_CONCRETE"); + + public static final BlockType YELLOW_CONCRETE_POWDER = DummyObjectProvider.createFor(BlockType.class, "YELLOW_CONCRETE_POWDER"); public static final BlockType YELLOW_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "YELLOW_GLAZED_TERRACOTTA"); public static final BlockType YELLOW_SHULKER_BOX = DummyObjectProvider.createFor(BlockType.class, "YELLOW_SHULKER_BOX"); + public static final BlockType YELLOW_STAINED_GLASS = DummyObjectProvider.createFor(BlockType.class, "YELLOW_STAINED_GLASS"); + + public static final BlockType YELLOW_STAINED_GLASS_PANE = DummyObjectProvider.createFor(BlockType.class, "YELLOW_STAINED_GLASS_PANE"); + + public static final BlockType YELLOW_TERRACOTTA = DummyObjectProvider.createFor(BlockType.class, "YELLOW_TERRACOTTA"); + + public static final BlockType YELLOW_WALL_BANNER = DummyObjectProvider.createFor(BlockType.class, "YELLOW_WALL_BANNER"); + + public static final BlockType YELLOW_WOOL = DummyObjectProvider.createFor(BlockType.class, "YELLOW_WOOL"); + + public static final BlockType ZOMBIE_HEAD = DummyObjectProvider.createFor(BlockType.class, "ZOMBIE_HEAD"); + + public static final BlockType ZOMBIE_WALL_HEAD = DummyObjectProvider.createFor(BlockType.class, "ZOMBIE_WALL_HEAD"); + // SORTFIELDS:OFF // Suppress default constructor to ensure non-instantiability. diff --git a/src/main/java/org/spongepowered/api/block/tileentity/Bed.java b/src/main/java/org/spongepowered/api/block/tileentity/Bed.java deleted file mode 100644 index 78f2ed18c2d..00000000000 --- a/src/main/java/org/spongepowered/api/block/tileentity/Bed.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.block.tileentity; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.mutable.DyeableData; -import org.spongepowered.api.data.type.DyeColor; -import org.spongepowered.api.data.value.mutable.Value; - -/** - * Represents a Bed {@link TileEntity}. - */ -public interface Bed extends TileEntity { - - /** - * Gets the {@link DyeableData data} of this {@link Bed bed}. - * - * @return The current bed data for this bed - */ - default DyeableData getDyeableData() { - return this.get(DyeableData.class).get(); - } - - /** - * Gets the {@link Value} for the {@link DyeColor color}. - * - * @return The value for the color - */ - default Value color() { - return this.getValue(Keys.DYE_COLOR).get(); - } - -} diff --git a/src/main/java/org/spongepowered/api/block/tileentity/FlowerPot.java b/src/main/java/org/spongepowered/api/block/tileentity/FlowerPot.java deleted file mode 100644 index ac3691157da..00000000000 --- a/src/main/java/org/spongepowered/api/block/tileentity/FlowerPot.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.block.tileentity; - -/** - * Represents a flower pot. - */ -public interface FlowerPot extends TileEntity { - -} diff --git a/src/main/java/org/spongepowered/api/block/tileentity/Jukebox.java b/src/main/java/org/spongepowered/api/block/tileentity/Jukebox.java index 1c1d3407f87..a42c62b2e09 100644 --- a/src/main/java/org/spongepowered/api/block/tileentity/Jukebox.java +++ b/src/main/java/org/spongepowered/api/block/tileentity/Jukebox.java @@ -28,30 +28,30 @@ import org.spongepowered.api.item.inventory.ItemStack; /** - * Represents a jukebox, also know as a record player. + * Represents a jukebox, also know as a music disc player. */ public interface Jukebox extends TileEntity { /** - * Attempts to play the currently stored record according to the + * Attempts to play the currently stored music disc according to the * {@link RepresentedItemData} of this {@link Jukebox}. */ - void playRecord(); + void play(); /** - * Stops the currently playing record, if any. + * Stops the currently playing music disc, if any. */ - void stopRecord(); + void stop(); /** - * Ejects the record item in this Jukebox into the world. + * Ejects the music disc item in this Jukebox into the world. */ - void ejectRecord(); + void eject(); /** - * Ejects the current record in this Jukebox and inserts the given one. + * Ejects the current music disc item in this Jukebox and inserts the given one. * - * @param record The record to insert + * @param disc The music disc item to insert */ - void insertRecord(ItemStack record); + void insert(ItemStack disc); } diff --git a/src/main/java/org/spongepowered/api/block/tileentity/Note.java b/src/main/java/org/spongepowered/api/block/tileentity/Note.java deleted file mode 100644 index 05591661571..00000000000 --- a/src/main/java/org/spongepowered/api/block/tileentity/Note.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.block.tileentity; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.mutable.tileentity.NoteData; -import org.spongepowered.api.data.type.NotePitch; -import org.spongepowered.api.data.value.mutable.Value; - -/** - * Represents a note block. - * - *

A {@link Note} will always have a valid {@link NoteData} to play.

- */ -public interface Note extends TileEntity { - - /** - * Attempts to play the currently stored {@link NotePitch} from this - * {@link Note} tile entity. - */ - void playNote(); - - /** - * Retrieves the {@link NoteData} for this note block. - * - * @return the note data - */ - default NoteData getNoteData() { - return get(NoteData.class).get(); - } - - /** - * Gets the {@link Value} for the {@link NotePitch}. - * - * @return The value for the note pitch - * @see Keys#NOTE_PITCH - */ - default Value note() { - return getValue(Keys.NOTE_PITCH).get(); - } - -} diff --git a/src/main/java/org/spongepowered/api/block/tileentity/Skull.java b/src/main/java/org/spongepowered/api/block/tileentity/PlayerHead.java similarity index 68% rename from src/main/java/org/spongepowered/api/block/tileentity/Skull.java rename to src/main/java/org/spongepowered/api/block/tileentity/PlayerHead.java index 9d644e13a05..57ef50a4e49 100644 --- a/src/main/java/org/spongepowered/api/block/tileentity/Skull.java +++ b/src/main/java/org/spongepowered/api/block/tileentity/PlayerHead.java @@ -25,32 +25,31 @@ package org.spongepowered.api.block.tileentity; import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.mutable.SkullData; -import org.spongepowered.api.data.type.SkullType; +import org.spongepowered.api.data.manipulator.mutable.RepresentedPlayerData; import org.spongepowered.api.data.value.mutable.Value; +import org.spongepowered.api.profile.GameProfile; /** - * Represents a skull. + * Represents a player head. */ -public interface Skull extends TileEntity { +public interface PlayerHead extends TileEntity { /** - * Gets the current {@link SkullData} for this {@link Skull} - * {@link TileEntity}. + * Gets the current represented player {@link GameProfile} for this {@link PlayerHead}. * - * @return The skull data for this skull + * @return The current represented player value */ - default SkullData getSkullData() { - return get(SkullData.class).get(); + default Value representedPlayer() { + return getValue(Keys.REPRESENTED_PLAYER).get(); } /** - * Gets the current {@link SkullType} for this {@link Skull}. + * Gets the current {@link RepresentedPlayerData} for this {@link PlayerHead} + * {@link TileEntity}. * - * @return The current skull type value + * @return The represented player data */ - default Value skullType() { - return getValue(Keys.SKULL_TYPE).get(); + default RepresentedPlayerData getRepresentedPlayerData() { + return get(RepresentedPlayerData.class).get(); } - } diff --git a/src/main/java/org/spongepowered/api/block/tileentity/TileEntityTypes.java b/src/main/java/org/spongepowered/api/block/tileentity/TileEntityTypes.java index 32ed05eea32..1fb022dea5d 100644 --- a/src/main/java/org/spongepowered/api/block/tileentity/TileEntityTypes.java +++ b/src/main/java/org/spongepowered/api/block/tileentity/TileEntityTypes.java @@ -60,8 +60,6 @@ private TileEntityTypes() {} public static final TileEntityType END_PORTAL = DummyObjectProvider.createFor(TileEntityType.class, "END_PORTAL"); - public static final TileEntityType FLOWER_POT = DummyObjectProvider.createFor(TileEntityType.class, "FLOWER_POT"); - public static final TileEntityType FURNACE = DummyObjectProvider.createFor(TileEntityType.class, "FURNACE"); public static final TileEntityType HOPPER = DummyObjectProvider.createFor(TileEntityType.class, "HOPPER"); @@ -70,18 +68,18 @@ private TileEntityTypes() {} public static final TileEntityType MOB_SPAWNER = DummyObjectProvider.createFor(TileEntityType.class, "MOB_SPAWNER"); - public static final TileEntityType NOTE = DummyObjectProvider.createFor(TileEntityType.class, "NOTE"); - public static final TileEntityType PISTON = DummyObjectProvider.createFor(TileEntityType.class, "PISTON"); + public static final TileEntityType PLAYER_HEAD = DummyObjectProvider.createFor(TileEntityType.class, "PLAYER_HEAD"); + public static final TileEntityType SHULKER_BOX = DummyObjectProvider.createFor(TileEntityType.class, "SHULKER_BOX"); public static final TileEntityType SIGN = DummyObjectProvider.createFor(TileEntityType.class, "SIGN"); - public static final TileEntityType SKULL = DummyObjectProvider.createFor(TileEntityType.class, "SKULL"); - public static final TileEntityType STRUCTURE = DummyObjectProvider.createFor(TileEntityType.class, "STRUCTURE"); + public static final TileEntityType TRAPPED_CHEST = DummyObjectProvider.createFor(TileEntityType.class, "TRAPPED_CHEST"); + // SORTFIELDS:OFF } diff --git a/src/main/java/org/spongepowered/api/block/trait/BooleanTraits.java b/src/main/java/org/spongepowered/api/block/trait/BooleanTraits.java index 3ebad40ad5c..174b92fb551 100644 --- a/src/main/java/org/spongepowered/api/block/trait/BooleanTraits.java +++ b/src/main/java/org/spongepowered/api/block/trait/BooleanTraits.java @@ -34,6 +34,8 @@ public final class BooleanTraits { // SORTFIELDS:ON + public static final BooleanTrait ACACIA_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_BUTTON_POWERED"); + public static final BooleanTrait ACACIA_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_DOOR_OPEN"); public static final BooleanTrait ACACIA_DOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_DOOR_POWERED"); @@ -50,11 +52,27 @@ public final class BooleanTraits { public static final BooleanTrait ACACIA_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_FENCE_SOUTH"); + public static final BooleanTrait ACACIA_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_FENCE_WATERLOGGED"); + public static final BooleanTrait ACACIA_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_FENCE_WEST"); + public static final BooleanTrait ACACIA_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_LEAVES_PERSISTENT"); + + public static final BooleanTrait ACACIA_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_PRESSURE_PLATE_POWERED"); + + public static final BooleanTrait ACACIA_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_SLAB_WATERLOGGED"); + + public static final BooleanTrait ACACIA_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_STAIRS_WATERLOGGED"); + + public static final BooleanTrait ACACIA_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_TRAPDOOR_OPEN"); + + public static final BooleanTrait ACACIA_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_TRAPDOOR_POWERED"); + + public static final BooleanTrait ACACIA_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ACACIA_TRAPDOOR_WATERLOGGED"); + public static final BooleanTrait ACTIVATOR_RAIL_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "ACTIVATOR_RAIL_POWERED"); - public static final BooleanTrait BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "BED_OCCUPIED"); + public static final BooleanTrait BIRCH_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_BUTTON_POWERED"); public static final BooleanTrait BIRCH_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_DOOR_OPEN"); @@ -72,14 +90,116 @@ public final class BooleanTraits { public static final BooleanTrait BIRCH_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_FENCE_SOUTH"); + public static final BooleanTrait BIRCH_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_FENCE_WATERLOGGED"); + public static final BooleanTrait BIRCH_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_FENCE_WEST"); + public static final BooleanTrait BIRCH_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_LEAVES_PERSISTENT"); + + public static final BooleanTrait BIRCH_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_PRESSURE_PLATE_POWERED"); + + public static final BooleanTrait BIRCH_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_SLAB_WATERLOGGED"); + + public static final BooleanTrait BIRCH_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_STAIRS_WATERLOGGED"); + + public static final BooleanTrait BIRCH_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_TRAPDOOR_OPEN"); + + public static final BooleanTrait BIRCH_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_TRAPDOOR_POWERED"); + + public static final BooleanTrait BIRCH_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BIRCH_TRAPDOOR_WATERLOGGED"); + + public static final BooleanTrait BLACK_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_BED_OCCUPIED"); + + public static final BooleanTrait BLACK_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait BLACK_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait BLACK_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait BLACK_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait BLACK_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "BLACK_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait BLUE_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_BED_OCCUPIED"); + + public static final BooleanTrait BLUE_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait BLUE_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait BLUE_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait BLUE_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait BLUE_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "BLUE_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait BRAIN_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BRAIN_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait BRAIN_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BRAIN_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait BRAIN_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BRAIN_CORAL_WATERLOGGED"); + public static final BooleanTrait BREWING_STAND_HAS_BOTTLE_0 = DummyObjectProvider.createFor(BooleanTrait.class, "BREWING_STAND_HAS_BOTTLE_0"); public static final BooleanTrait BREWING_STAND_HAS_BOTTLE_1 = DummyObjectProvider.createFor(BooleanTrait.class, "BREWING_STAND_HAS_BOTTLE_1"); public static final BooleanTrait BREWING_STAND_HAS_BOTTLE_2 = DummyObjectProvider.createFor(BooleanTrait.class, "BREWING_STAND_HAS_BOTTLE_2"); + public static final BooleanTrait BRICK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BRICK_SLAB_WATERLOGGED"); + + public static final BooleanTrait BRICK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BRICK_STAIRS_WATERLOGGED"); + + public static final BooleanTrait BROWN_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_BED_OCCUPIED"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_DOWN = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_DOWN"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_EAST"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_NORTH"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_SOUTH"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_UP = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_UP"); + + public static final BooleanTrait BROWN_MUSHROOM_BLOCK_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_MUSHROOM_BLOCK_WEST"); + + public static final BooleanTrait BROWN_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait BROWN_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait BROWN_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait BROWN_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait BROWN_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "BROWN_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait BUBBLE_COLUMN_DRAG = DummyObjectProvider.createFor(BooleanTrait.class, "BUBBLE_COLUMN_DRAG"); + + public static final BooleanTrait BUBBLE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BUBBLE_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait BUBBLE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BUBBLE_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait BUBBLE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "BUBBLE_CORAL_WATERLOGGED"); + + public static final BooleanTrait CHAIN_COMMAND_BLOCK_CONDITIONAL = DummyObjectProvider.createFor(BooleanTrait.class, "CHAIN_COMMAND_BLOCK_CONDITIONAL"); + + public static final BooleanTrait CHEST_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "CHEST_WATERLOGGED"); + + public static final BooleanTrait CHORUS_PLANT_DOWN = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_DOWN"); + + public static final BooleanTrait CHORUS_PLANT_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_EAST"); + + public static final BooleanTrait CHORUS_PLANT_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_NORTH"); + + public static final BooleanTrait CHORUS_PLANT_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_SOUTH"); + + public static final BooleanTrait CHORUS_PLANT_UP = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_UP"); + + public static final BooleanTrait CHORUS_PLANT_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "CHORUS_PLANT_WEST"); + + public static final BooleanTrait COBBLESTONE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_SLAB_WATERLOGGED"); + + public static final BooleanTrait COBBLESTONE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_STAIRS_WATERLOGGED"); + public static final BooleanTrait COBBLESTONE_WALL_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_WALL_EAST"); public static final BooleanTrait COBBLESTONE_WALL_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_WALL_NORTH"); @@ -88,8 +208,30 @@ public final class BooleanTraits { public static final BooleanTrait COBBLESTONE_WALL_UP = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_WALL_UP"); + public static final BooleanTrait COBBLESTONE_WALL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_WALL_WATERLOGGED"); + public static final BooleanTrait COBBLESTONE_WALL_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "COBBLESTONE_WALL_WEST"); + public static final BooleanTrait COMMAND_BLOCK_CONDITIONAL = DummyObjectProvider.createFor(BooleanTrait.class, "COMMAND_BLOCK_CONDITIONAL"); + + public static final BooleanTrait COMPARATOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "COMPARATOR_POWERED"); + + public static final BooleanTrait CONDUIT_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "CONDUIT_WATERLOGGED"); + + public static final BooleanTrait CYAN_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_BED_OCCUPIED"); + + public static final BooleanTrait CYAN_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait CYAN_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait CYAN_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait CYAN_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait CYAN_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "CYAN_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait DARK_OAK_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_BUTTON_POWERED"); + public static final BooleanTrait DARK_OAK_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_DOOR_OPEN"); public static final BooleanTrait DARK_OAK_DOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_DOOR_POWERED"); @@ -106,35 +248,75 @@ public final class BooleanTraits { public static final BooleanTrait DARK_OAK_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_FENCE_SOUTH"); + public static final BooleanTrait DARK_OAK_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_FENCE_WATERLOGGED"); + public static final BooleanTrait DARK_OAK_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_FENCE_WEST"); - public static final BooleanTrait DETECTOR_RAIL_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DETECTOR_RAIL_POWERED"); + public static final BooleanTrait DARK_OAK_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_LEAVES_PERSISTENT"); - public static final BooleanTrait DIRT_SNOWY = DummyObjectProvider.createFor(BooleanTrait.class, "DIRT_SNOWY"); + public static final BooleanTrait DARK_OAK_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_PRESSURE_PLATE_POWERED"); - public static final BooleanTrait DISPENSER_TRIGGERED = DummyObjectProvider.createFor(BooleanTrait.class, "DISPENSER_TRIGGERED"); + public static final BooleanTrait DARK_OAK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_SLAB_WATERLOGGED"); - public static final BooleanTrait DOUBLE_STONE_SLAB2_SEAMLESS = DummyObjectProvider.createFor(BooleanTrait.class, "DOUBLE_STONE_SLAB2_SEAMLESS"); + public static final BooleanTrait DARK_OAK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_STAIRS_WATERLOGGED"); - public static final BooleanTrait DOUBLE_STONE_SLAB_SEAMLESS = DummyObjectProvider.createFor(BooleanTrait.class, "DOUBLE_STONE_SLAB_SEAMLESS"); + public static final BooleanTrait DARK_OAK_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_TRAPDOOR_OPEN"); - public static final BooleanTrait DROPPER_TRIGGERED = DummyObjectProvider.createFor(BooleanTrait.class, "DROPPER_TRIGGERED"); + public static final BooleanTrait DARK_OAK_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_TRAPDOOR_POWERED"); - public static final BooleanTrait END_PORTAL_FRAME_EYE = DummyObjectProvider.createFor(BooleanTrait.class, "END_PORTAL_FRAME_EYE"); + public static final BooleanTrait DARK_OAK_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_OAK_TRAPDOOR_WATERLOGGED"); + + public static final BooleanTrait DARK_PRISMARINE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_PRISMARINE_SLAB_WATERLOGGED"); + + public static final BooleanTrait DARK_PRISMARINE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DARK_PRISMARINE_STAIRS_WATERLOGGED"); + + public static final BooleanTrait DAYLIGHT_DETECTOR_INVERTED = DummyObjectProvider.createFor(BooleanTrait.class, "DAYLIGHT_DETECTOR_INVERTED"); - public static final BooleanTrait FENCE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_EAST"); + public static final BooleanTrait DEAD_BRAIN_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BRAIN_CORAL_FAN_WATERLOGGED"); - public static final BooleanTrait FENCE_GATE_IN_WALL = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_GATE_IN_WALL"); + public static final BooleanTrait DEAD_BRAIN_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BRAIN_CORAL_WALL_FAN_WATERLOGGED"); - public static final BooleanTrait FENCE_GATE_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_GATE_OPEN"); + public static final BooleanTrait DEAD_BRAIN_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BRAIN_CORAL_WATERLOGGED"); - public static final BooleanTrait FENCE_GATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_GATE_POWERED"); + public static final BooleanTrait DEAD_BUBBLE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BUBBLE_CORAL_FAN_WATERLOGGED"); - public static final BooleanTrait FENCE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_NORTH"); + public static final BooleanTrait DEAD_BUBBLE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BUBBLE_CORAL_WALL_FAN_WATERLOGGED"); - public static final BooleanTrait FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_SOUTH"); + public static final BooleanTrait DEAD_BUBBLE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_BUBBLE_CORAL_WATERLOGGED"); - public static final BooleanTrait FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "FENCE_WEST"); + public static final BooleanTrait DEAD_FIRE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_FIRE_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_FIRE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_FIRE_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_FIRE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_FIRE_CORAL_WATERLOGGED"); + + public static final BooleanTrait DEAD_HORN_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_HORN_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_HORN_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_HORN_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_HORN_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_HORN_CORAL_WATERLOGGED"); + + public static final BooleanTrait DEAD_TUBE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_TUBE_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_TUBE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_TUBE_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait DEAD_TUBE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "DEAD_TUBE_CORAL_WATERLOGGED"); + + public static final BooleanTrait DETECTOR_RAIL_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "DETECTOR_RAIL_POWERED"); + + public static final BooleanTrait DISPENSER_TRIGGERED = DummyObjectProvider.createFor(BooleanTrait.class, "DISPENSER_TRIGGERED"); + + public static final BooleanTrait DROPPER_TRIGGERED = DummyObjectProvider.createFor(BooleanTrait.class, "DROPPER_TRIGGERED"); + + public static final BooleanTrait ENDER_CHEST_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ENDER_CHEST_WATERLOGGED"); + + public static final BooleanTrait END_PORTAL_FRAME_EYE = DummyObjectProvider.createFor(BooleanTrait.class, "END_PORTAL_FRAME_EYE"); + + public static final BooleanTrait FIRE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "FIRE_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait FIRE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "FIRE_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait FIRE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "FIRE_CORAL_WATERLOGGED"); public static final BooleanTrait FIRE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "FIRE_EAST"); @@ -146,26 +328,60 @@ public final class BooleanTraits { public static final BooleanTrait FIRE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "FIRE_WEST"); + public static final BooleanTrait FURNACE_LIT = DummyObjectProvider.createFor(BooleanTrait.class, "FURNACE_LIT"); + public static final BooleanTrait GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "GLASS_PANE_EAST"); public static final BooleanTrait GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "GLASS_PANE_NORTH"); public static final BooleanTrait GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "GLASS_PANE_SOUTH"); + public static final BooleanTrait GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "GLASS_PANE_WATERLOGGED"); + public static final BooleanTrait GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "GLASS_PANE_WEST"); - public static final BooleanTrait GOLDEN_RAIL_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "GOLDEN_RAIL_POWERED"); + public static final BooleanTrait GRASS_BLOCK_SNOWY = DummyObjectProvider.createFor(BooleanTrait.class, "GRASS_BLOCK_SNOWY"); + + public static final BooleanTrait GRAY_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_BED_OCCUPIED"); + + public static final BooleanTrait GRAY_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait GRAY_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait GRAY_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait GRAY_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait GRAY_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "GRAY_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait GREEN_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_BED_OCCUPIED"); + + public static final BooleanTrait GREEN_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait GREEN_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait GREEN_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_STAINED_GLASS_PANE_SOUTH"); - public static final BooleanTrait GRASS_SNOWY = DummyObjectProvider.createFor(BooleanTrait.class, "GRASS_SNOWY"); + public static final BooleanTrait GREEN_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait GREEN_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "GREEN_STAINED_GLASS_PANE_WEST"); public static final BooleanTrait HOPPER_ENABLED = DummyObjectProvider.createFor(BooleanTrait.class, "HOPPER_ENABLED"); + public static final BooleanTrait HORN_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "HORN_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait HORN_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "HORN_CORAL_WALL_FAN_WATERLOGGED"); + + public static final BooleanTrait HORN_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "HORN_CORAL_WATERLOGGED"); + public static final BooleanTrait IRON_BARS_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_BARS_EAST"); public static final BooleanTrait IRON_BARS_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_BARS_NORTH"); public static final BooleanTrait IRON_BARS_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_BARS_SOUTH"); + public static final BooleanTrait IRON_BARS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_BARS_WATERLOGGED"); + public static final BooleanTrait IRON_BARS_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_BARS_WEST"); public static final BooleanTrait IRON_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_DOOR_OPEN"); @@ -174,8 +390,14 @@ public final class BooleanTraits { public static final BooleanTrait IRON_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_TRAPDOOR_OPEN"); + public static final BooleanTrait IRON_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_TRAPDOOR_POWERED"); + + public static final BooleanTrait IRON_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "IRON_TRAPDOOR_WATERLOGGED"); + public static final BooleanTrait JUKEBOX_HAS_RECORD = DummyObjectProvider.createFor(BooleanTrait.class, "JUKEBOX_HAS_RECORD"); + public static final BooleanTrait JUNGLE_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_BUTTON_POWERED"); + public static final BooleanTrait JUNGLE_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_DOOR_OPEN"); public static final BooleanTrait JUNGLE_DOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_DOOR_POWERED"); @@ -192,18 +414,100 @@ public final class BooleanTraits { public static final BooleanTrait JUNGLE_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_FENCE_SOUTH"); + public static final BooleanTrait JUNGLE_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_FENCE_WATERLOGGED"); + public static final BooleanTrait JUNGLE_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_FENCE_WEST"); - public static final BooleanTrait LEAVES2_CHECK_DECAY = DummyObjectProvider.createFor(BooleanTrait.class, "LEAVES2_CHECK_DECAY"); + public static final BooleanTrait JUNGLE_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_LEAVES_PERSISTENT"); + + public static final BooleanTrait JUNGLE_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_PRESSURE_PLATE_POWERED"); + + public static final BooleanTrait JUNGLE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_SLAB_WATERLOGGED"); + + public static final BooleanTrait JUNGLE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_STAIRS_WATERLOGGED"); - public static final BooleanTrait LEAVES2_DECAYABLE = DummyObjectProvider.createFor(BooleanTrait.class, "LEAVES2_DECAYABLE"); + public static final BooleanTrait JUNGLE_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_TRAPDOOR_OPEN"); - public static final BooleanTrait LEAVES_CHECK_DECAY = DummyObjectProvider.createFor(BooleanTrait.class, "LEAVES_CHECK_DECAY"); + public static final BooleanTrait JUNGLE_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_TRAPDOOR_POWERED"); - public static final BooleanTrait LEAVES_DECAYABLE = DummyObjectProvider.createFor(BooleanTrait.class, "LEAVES_DECAYABLE"); + public static final BooleanTrait JUNGLE_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "JUNGLE_TRAPDOOR_WATERLOGGED"); + + public static final BooleanTrait LADDER_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "LADDER_WATERLOGGED"); public static final BooleanTrait LEVER_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "LEVER_POWERED"); + public static final BooleanTrait LIGHT_BLUE_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_BED_OCCUPIED"); + + public static final BooleanTrait LIGHT_BLUE_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait LIGHT_BLUE_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait LIGHT_BLUE_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait LIGHT_BLUE_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait LIGHT_BLUE_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_BLUE_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait LIGHT_GRAY_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_BED_OCCUPIED"); + + public static final BooleanTrait LIGHT_GRAY_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait LIGHT_GRAY_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait LIGHT_GRAY_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait LIGHT_GRAY_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait LIGHT_GRAY_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "LIGHT_GRAY_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait LIME_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_BED_OCCUPIED"); + + public static final BooleanTrait LIME_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait LIME_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait LIME_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait LIME_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait LIME_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "LIME_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait MAGENTA_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_BED_OCCUPIED"); + + public static final BooleanTrait MAGENTA_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait MAGENTA_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait MAGENTA_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait MAGENTA_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait MAGENTA_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "MAGENTA_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_EAST"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_NORTH"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_SOUTH"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_UP = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_UP"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_WATERLOGGED"); + + public static final BooleanTrait MOSSY_COBBLESTONE_WALL_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "MOSSY_COBBLESTONE_WALL_WEST"); + + public static final BooleanTrait MUSHROOM_STEM_DOWN = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_DOWN"); + + public static final BooleanTrait MUSHROOM_STEM_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_EAST"); + + public static final BooleanTrait MUSHROOM_STEM_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_NORTH"); + + public static final BooleanTrait MUSHROOM_STEM_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_SOUTH"); + + public static final BooleanTrait MUSHROOM_STEM_UP = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_UP"); + + public static final BooleanTrait MUSHROOM_STEM_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "MUSHROOM_STEM_WEST"); + public static final BooleanTrait MYCELIUM_SNOWY = DummyObjectProvider.createFor(BooleanTrait.class, "MYCELIUM_SNOWY"); public static final BooleanTrait NETHER_BRICK_FENCE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_FENCE_EAST"); @@ -212,19 +516,167 @@ public final class BooleanTraits { public static final BooleanTrait NETHER_BRICK_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_FENCE_SOUTH"); + public static final BooleanTrait NETHER_BRICK_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_FENCE_WATERLOGGED"); + public static final BooleanTrait NETHER_BRICK_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_FENCE_WEST"); + public static final BooleanTrait NETHER_BRICK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_SLAB_WATERLOGGED"); + + public static final BooleanTrait NETHER_BRICK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "NETHER_BRICK_STAIRS_WATERLOGGED"); + + public static final BooleanTrait NOTE_BLOCK_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "NOTE_BLOCK_POWERED"); + + public static final BooleanTrait OAK_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_BUTTON_POWERED"); + + public static final BooleanTrait OAK_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_DOOR_OPEN"); + + public static final BooleanTrait OAK_DOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_DOOR_POWERED"); + + public static final BooleanTrait OAK_FENCE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_EAST"); + + public static final BooleanTrait OAK_FENCE_GATE_IN_WALL = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_GATE_IN_WALL"); + + public static final BooleanTrait OAK_FENCE_GATE_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_GATE_OPEN"); + + public static final BooleanTrait OAK_FENCE_GATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_GATE_POWERED"); + + public static final BooleanTrait OAK_FENCE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_NORTH"); + + public static final BooleanTrait OAK_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_SOUTH"); + + public static final BooleanTrait OAK_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_WATERLOGGED"); + + public static final BooleanTrait OAK_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_FENCE_WEST"); + + public static final BooleanTrait OAK_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_LEAVES_PERSISTENT"); + + public static final BooleanTrait OAK_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_PRESSURE_PLATE_POWERED"); + + public static final BooleanTrait OAK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_SLAB_WATERLOGGED"); + + public static final BooleanTrait OAK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_STAIRS_WATERLOGGED"); + + public static final BooleanTrait OAK_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_TRAPDOOR_OPEN"); + + public static final BooleanTrait OAK_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_TRAPDOOR_POWERED"); + + public static final BooleanTrait OAK_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "OAK_TRAPDOOR_WATERLOGGED"); + + public static final BooleanTrait OBSERVER_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "OBSERVER_POWERED"); + + public static final BooleanTrait ORANGE_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_BED_OCCUPIED"); + + public static final BooleanTrait ORANGE_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait ORANGE_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait ORANGE_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait ORANGE_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait ORANGE_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "ORANGE_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait PETRIFIED_OAK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PETRIFIED_OAK_SLAB_WATERLOGGED"); + + public static final BooleanTrait PINK_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_BED_OCCUPIED"); + + public static final BooleanTrait PINK_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait PINK_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait PINK_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait PINK_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait PINK_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "PINK_STAINED_GLASS_PANE_WEST"); + public static final BooleanTrait PISTON_EXTENDED = DummyObjectProvider.createFor(BooleanTrait.class, "PISTON_EXTENDED"); public static final BooleanTrait PISTON_HEAD_SHORT = DummyObjectProvider.createFor(BooleanTrait.class, "PISTON_HEAD_SHORT"); - public static final BooleanTrait POWERED_COMPARATOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "POWERED_COMPARATOR_POWERED"); + public static final BooleanTrait PODZOL_SNOWY = DummyObjectProvider.createFor(BooleanTrait.class, "PODZOL_SNOWY"); + + public static final BooleanTrait POWERED_RAIL_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "POWERED_RAIL_POWERED"); + + public static final BooleanTrait PRISMARINE_BRICK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PRISMARINE_BRICK_SLAB_WATERLOGGED"); + + public static final BooleanTrait PRISMARINE_BRICK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PRISMARINE_BRICK_STAIRS_WATERLOGGED"); + + public static final BooleanTrait PRISMARINE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PRISMARINE_SLAB_WATERLOGGED"); + + public static final BooleanTrait PRISMARINE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PRISMARINE_STAIRS_WATERLOGGED"); + + public static final BooleanTrait PURPLE_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_BED_OCCUPIED"); + + public static final BooleanTrait PURPLE_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait PURPLE_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait PURPLE_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait PURPLE_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait PURPLE_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "PURPLE_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait PURPUR_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PURPUR_SLAB_WATERLOGGED"); + + public static final BooleanTrait PURPUR_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "PURPUR_STAIRS_WATERLOGGED"); + + public static final BooleanTrait QUARTZ_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "QUARTZ_SLAB_WATERLOGGED"); + + public static final BooleanTrait QUARTZ_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "QUARTZ_STAIRS_WATERLOGGED"); + + public static final BooleanTrait REDSTONE_LAMP_LIT = DummyObjectProvider.createFor(BooleanTrait.class, "REDSTONE_LAMP_LIT"); + + public static final BooleanTrait REDSTONE_ORE_LIT = DummyObjectProvider.createFor(BooleanTrait.class, "REDSTONE_ORE_LIT"); + + public static final BooleanTrait REDSTONE_TORCH_LIT = DummyObjectProvider.createFor(BooleanTrait.class, "REDSTONE_TORCH_LIT"); + + public static final BooleanTrait REDSTONE_WALL_TORCH_LIT = DummyObjectProvider.createFor(BooleanTrait.class, "REDSTONE_WALL_TORCH_LIT"); + + public static final BooleanTrait RED_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "RED_BED_OCCUPIED"); + + public static final BooleanTrait RED_MUSHROOM_BLOCK_DOWN = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_DOWN"); + + public static final BooleanTrait RED_MUSHROOM_BLOCK_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_EAST"); + + public static final BooleanTrait RED_MUSHROOM_BLOCK_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_NORTH"); + + public static final BooleanTrait RED_MUSHROOM_BLOCK_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_SOUTH"); - public static final BooleanTrait POWERED_REPEATER_LOCKED = DummyObjectProvider.createFor(BooleanTrait.class, "POWERED_REPEATER_LOCKED"); + public static final BooleanTrait RED_MUSHROOM_BLOCK_UP = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_UP"); - public static final BooleanTrait SKULL_NODROP = DummyObjectProvider.createFor(BooleanTrait.class, "SKULL_NODROP"); + public static final BooleanTrait RED_MUSHROOM_BLOCK_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "RED_MUSHROOM_BLOCK_WEST"); - public static final BooleanTrait SPONGE_WET = DummyObjectProvider.createFor(BooleanTrait.class, "SPONGE_WET"); + public static final BooleanTrait RED_SANDSTONE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "RED_SANDSTONE_SLAB_WATERLOGGED"); + + public static final BooleanTrait RED_SANDSTONE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "RED_SANDSTONE_STAIRS_WATERLOGGED"); + + public static final BooleanTrait RED_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "RED_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait RED_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "RED_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait RED_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "RED_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait RED_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "RED_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait RED_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "RED_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait REPEATER_LOCKED = DummyObjectProvider.createFor(BooleanTrait.class, "REPEATER_LOCKED"); + + public static final BooleanTrait REPEATER_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "REPEATER_POWERED"); + + public static final BooleanTrait REPEATING_COMMAND_BLOCK_CONDITIONAL = DummyObjectProvider.createFor(BooleanTrait.class, "REPEATING_COMMAND_BLOCK_CONDITIONAL"); + + public static final BooleanTrait SANDSTONE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SANDSTONE_SLAB_WATERLOGGED"); + + public static final BooleanTrait SANDSTONE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SANDSTONE_STAIRS_WATERLOGGED"); + + public static final BooleanTrait SEA_PICKLE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SEA_PICKLE_WATERLOGGED"); + + public static final BooleanTrait SIGN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SIGN_WATERLOGGED"); + + public static final BooleanTrait SPRUCE_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_BUTTON_POWERED"); public static final BooleanTrait SPRUCE_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_DOOR_OPEN"); @@ -242,25 +694,39 @@ public final class BooleanTraits { public static final BooleanTrait SPRUCE_FENCE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_FENCE_SOUTH"); + public static final BooleanTrait SPRUCE_FENCE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_FENCE_WATERLOGGED"); + public static final BooleanTrait SPRUCE_FENCE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_FENCE_WEST"); - public static final BooleanTrait STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "STAINED_GLASS_PANE_EAST"); + public static final BooleanTrait SPRUCE_LEAVES_PERSISTENT = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_LEAVES_PERSISTENT"); + + public static final BooleanTrait SPRUCE_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_PRESSURE_PLATE_POWERED"); - public static final BooleanTrait STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "STAINED_GLASS_PANE_NORTH"); + public static final BooleanTrait SPRUCE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_SLAB_WATERLOGGED"); - public static final BooleanTrait STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "STAINED_GLASS_PANE_SOUTH"); + public static final BooleanTrait SPRUCE_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_STAIRS_WATERLOGGED"); - public static final BooleanTrait STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "STAINED_GLASS_PANE_WEST"); + public static final BooleanTrait SPRUCE_TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_TRAPDOOR_OPEN"); + + public static final BooleanTrait SPRUCE_TRAPDOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_TRAPDOOR_POWERED"); + + public static final BooleanTrait SPRUCE_TRAPDOOR_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "SPRUCE_TRAPDOOR_WATERLOGGED"); public static final BooleanTrait STICKY_PISTON_EXTENDED = DummyObjectProvider.createFor(BooleanTrait.class, "STICKY_PISTON_EXTENDED"); + public static final BooleanTrait STONE_BRICK_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "STONE_BRICK_SLAB_WATERLOGGED"); + + public static final BooleanTrait STONE_BRICK_STAIRS_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "STONE_BRICK_STAIRS_WATERLOGGED"); + public static final BooleanTrait STONE_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "STONE_BUTTON_POWERED"); public static final BooleanTrait STONE_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "STONE_PRESSURE_PLATE_POWERED"); - public static final BooleanTrait TNT_EXPLODE = DummyObjectProvider.createFor(BooleanTrait.class, "TNT_EXPLODE"); + public static final BooleanTrait STONE_SLAB_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "STONE_SLAB_WATERLOGGED"); - public static final BooleanTrait TRAPDOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "TRAPDOOR_OPEN"); + public static final BooleanTrait TNT_UNSTABLE = DummyObjectProvider.createFor(BooleanTrait.class, "TNT_UNSTABLE"); + + public static final BooleanTrait TRAPPED_CHEST_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "TRAPPED_CHEST_WATERLOGGED"); public static final BooleanTrait TRIPWIRE_ATTACHED = DummyObjectProvider.createFor(BooleanTrait.class, "TRIPWIRE_ATTACHED"); @@ -280,9 +746,11 @@ public final class BooleanTraits { public static final BooleanTrait TRIPWIRE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "TRIPWIRE_WEST"); - public static final BooleanTrait UNPOWERED_COMPARATOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "UNPOWERED_COMPARATOR_POWERED"); + public static final BooleanTrait TUBE_CORAL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "TUBE_CORAL_FAN_WATERLOGGED"); + + public static final BooleanTrait TUBE_CORAL_WALL_FAN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "TUBE_CORAL_WALL_FAN_WATERLOGGED"); - public static final BooleanTrait UNPOWERED_REPEATER_LOCKED = DummyObjectProvider.createFor(BooleanTrait.class, "UNPOWERED_REPEATER_LOCKED"); + public static final BooleanTrait TUBE_CORAL_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "TUBE_CORAL_WATERLOGGED"); public static final BooleanTrait VINE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "VINE_EAST"); @@ -294,13 +762,31 @@ public final class BooleanTraits { public static final BooleanTrait VINE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "VINE_WEST"); - public static final BooleanTrait WOODEN_BUTTON_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "WOODEN_BUTTON_POWERED"); + public static final BooleanTrait WALL_SIGN_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "WALL_SIGN_WATERLOGGED"); + + public static final BooleanTrait WHITE_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_BED_OCCUPIED"); + + public static final BooleanTrait WHITE_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait WHITE_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_STAINED_GLASS_PANE_NORTH"); + + public static final BooleanTrait WHITE_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_STAINED_GLASS_PANE_SOUTH"); + + public static final BooleanTrait WHITE_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_STAINED_GLASS_PANE_WATERLOGGED"); + + public static final BooleanTrait WHITE_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "WHITE_STAINED_GLASS_PANE_WEST"); + + public static final BooleanTrait YELLOW_BED_OCCUPIED = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_BED_OCCUPIED"); + + public static final BooleanTrait YELLOW_STAINED_GLASS_PANE_EAST = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_STAINED_GLASS_PANE_EAST"); + + public static final BooleanTrait YELLOW_STAINED_GLASS_PANE_NORTH = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_STAINED_GLASS_PANE_NORTH"); - public static final BooleanTrait WOODEN_DOOR_OPEN = DummyObjectProvider.createFor(BooleanTrait.class, "WOODEN_DOOR_OPEN"); + public static final BooleanTrait YELLOW_STAINED_GLASS_PANE_SOUTH = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_STAINED_GLASS_PANE_SOUTH"); - public static final BooleanTrait WOODEN_DOOR_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "WOODEN_DOOR_POWERED"); + public static final BooleanTrait YELLOW_STAINED_GLASS_PANE_WATERLOGGED = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_STAINED_GLASS_PANE_WATERLOGGED"); - public static final BooleanTrait WOODEN_PRESSURE_PLATE_POWERED = DummyObjectProvider.createFor(BooleanTrait.class, "WOODEN_PRESSURE_PLATE_POWERED"); + public static final BooleanTrait YELLOW_STAINED_GLASS_PANE_WEST = DummyObjectProvider.createFor(BooleanTrait.class, "YELLOW_STAINED_GLASS_PANE_WEST"); // SORTFIELDS:OFF diff --git a/src/main/java/org/spongepowered/api/block/trait/EnumTraits.java b/src/main/java/org/spongepowered/api/block/trait/EnumTraits.java index ee1354486ad..0e7c1f43690 100644 --- a/src/main/java/org/spongepowered/api/block/trait/EnumTraits.java +++ b/src/main/java/org/spongepowered/api/block/trait/EnumTraits.java @@ -34,6 +34,10 @@ public final class EnumTraits { // SORTFIELDS:ON + public static final EnumTrait ACACIA_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_BUTTON_FACE"); + + public static final EnumTrait ACACIA_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_BUTTON_FACING"); + public static final EnumTrait ACACIA_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_DOOR_FACING"); public static final EnumTrait ACACIA_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_DOOR_HALF"); @@ -42,19 +46,33 @@ public final class EnumTraits { public static final EnumTrait ACACIA_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_FENCE_GATE_FACING"); + public static final EnumTrait ACACIA_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_LOG_AXIS"); + + public static final EnumTrait ACACIA_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_SLAB_TYPE"); + public static final EnumTrait ACACIA_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_STAIRS_FACING"); public static final EnumTrait ACACIA_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_STAIRS_HALF"); public static final EnumTrait ACACIA_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_STAIRS_SHAPE"); + public static final EnumTrait ACACIA_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_TRAPDOOR_FACING"); + + public static final EnumTrait ACACIA_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_TRAPDOOR_HALF"); + + public static final EnumTrait ACACIA_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "ACACIA_WOOD_AXIS"); + public static final EnumTrait ACTIVATOR_RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "ACTIVATOR_RAIL_SHAPE"); public static final EnumTrait ANVIL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ANVIL_FACING"); - public static final EnumTrait BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BED_FACING"); + public static final EnumTrait ATTACHED_MELON_STEM_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ATTACHED_MELON_STEM_FACING"); + + public static final EnumTrait ATTACHED_PUMPKIN_STEM_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ATTACHED_PUMPKIN_STEM_FACING"); - public static final EnumTrait BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "BED_PART"); + public static final EnumTrait BIRCH_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_BUTTON_FACE"); + + public static final EnumTrait BIRCH_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_BUTTON_FACING"); public static final EnumTrait BIRCH_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_DOOR_FACING"); @@ -64,28 +82,110 @@ public final class EnumTraits { public static final EnumTrait BIRCH_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_FENCE_GATE_FACING"); + public static final EnumTrait BIRCH_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_LOG_AXIS"); + + public static final EnumTrait BIRCH_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_SLAB_TYPE"); + public static final EnumTrait BIRCH_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_STAIRS_FACING"); public static final EnumTrait BIRCH_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_STAIRS_HALF"); public static final EnumTrait BIRCH_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_STAIRS_SHAPE"); + public static final EnumTrait BIRCH_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_TRAPDOOR_FACING"); + + public static final EnumTrait BIRCH_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_TRAPDOOR_HALF"); + + public static final EnumTrait BIRCH_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "BIRCH_WOOD_AXIS"); + + public static final EnumTrait BLACK_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLACK_BED_FACING"); + + public static final EnumTrait BLACK_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "BLACK_BED_PART"); + + public static final EnumTrait BLACK_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLACK_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait BLACK_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLACK_SHULKER_BOX_FACING"); + + public static final EnumTrait BLACK_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLACK_WALL_BANNER_FACING"); + + public static final EnumTrait BLUE_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLUE_BED_FACING"); + + public static final EnumTrait BLUE_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "BLUE_BED_PART"); + + public static final EnumTrait BLUE_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLUE_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait BLUE_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLUE_SHULKER_BOX_FACING"); + + public static final EnumTrait BLUE_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BLUE_WALL_BANNER_FACING"); + + public static final EnumTrait BONE_BLOCK_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "BONE_BLOCK_AXIS"); + + public static final EnumTrait BRAIN_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BRAIN_CORAL_WALL_FAN_FACING"); + + public static final EnumTrait BRICK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "BRICK_SLAB_TYPE"); + public static final EnumTrait BRICK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BRICK_STAIRS_FACING"); public static final EnumTrait BRICK_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "BRICK_STAIRS_HALF"); public static final EnumTrait BRICK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "BRICK_STAIRS_SHAPE"); - public static final EnumTrait BROWN_MUSHROOM_BLOCK_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_MUSHROOM_BLOCK_VARIANT"); + public static final EnumTrait BROWN_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_BED_FACING"); + + public static final EnumTrait BROWN_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_BED_PART"); + + public static final EnumTrait BROWN_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait BROWN_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_SHULKER_BOX_FACING"); - public static final EnumTrait CARPET_COLOR = DummyObjectProvider.createFor(EnumTrait.class, "CARPET_COLOR"); + public static final EnumTrait BROWN_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BROWN_WALL_BANNER_FACING"); + + public static final EnumTrait BUBBLE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "BUBBLE_CORAL_WALL_FAN_FACING"); + + public static final EnumTrait CARVED_PUMPKIN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CARVED_PUMPKIN_FACING"); + + public static final EnumTrait CHAIN_COMMAND_BLOCK_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CHAIN_COMMAND_BLOCK_FACING"); public static final EnumTrait CHEST_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CHEST_FACING"); - public static final EnumTrait COBBLESTONE_WALL_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "COBBLESTONE_WALL_VARIANT"); + public static final EnumTrait CHEST_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "CHEST_TYPE"); + + public static final EnumTrait CHIPPED_ANVIL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CHIPPED_ANVIL_FACING"); + + public static final EnumTrait COBBLESTONE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "COBBLESTONE_SLAB_TYPE"); + + public static final EnumTrait COBBLESTONE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "COBBLESTONE_STAIRS_FACING"); + + public static final EnumTrait COBBLESTONE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "COBBLESTONE_STAIRS_HALF"); + + public static final EnumTrait COBBLESTONE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "COBBLESTONE_STAIRS_SHAPE"); public static final EnumTrait COCOA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "COCOA_FACING"); + public static final EnumTrait COMMAND_BLOCK_FACING = DummyObjectProvider.createFor(EnumTrait.class, "COMMAND_BLOCK_FACING"); + + public static final EnumTrait COMPARATOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "COMPARATOR_FACING"); + + public static final EnumTrait COMPARATOR_MODE = DummyObjectProvider.createFor(EnumTrait.class, "COMPARATOR_MODE"); + + public static final EnumTrait CREEPER_WALL_HEAD_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CREEPER_WALL_HEAD_FACING"); + + public static final EnumTrait CYAN_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CYAN_BED_FACING"); + + public static final EnumTrait CYAN_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "CYAN_BED_PART"); + + public static final EnumTrait CYAN_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CYAN_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait CYAN_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CYAN_SHULKER_BOX_FACING"); + + public static final EnumTrait CYAN_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "CYAN_WALL_BANNER_FACING"); + + public static final EnumTrait DAMAGED_ANVIL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DAMAGED_ANVIL_FACING"); + + public static final EnumTrait DARK_OAK_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_BUTTON_FACE"); + + public static final EnumTrait DARK_OAK_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_BUTTON_FACING"); + public static final EnumTrait DARK_OAK_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_DOOR_FACING"); public static final EnumTrait DARK_OAK_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_DOOR_HALF"); @@ -94,27 +194,45 @@ public final class EnumTraits { public static final EnumTrait DARK_OAK_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_FENCE_GATE_FACING"); + public static final EnumTrait DARK_OAK_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_LOG_AXIS"); + + public static final EnumTrait DARK_OAK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_SLAB_TYPE"); + public static final EnumTrait DARK_OAK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_STAIRS_FACING"); public static final EnumTrait DARK_OAK_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_STAIRS_HALF"); public static final EnumTrait DARK_OAK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_STAIRS_SHAPE"); - public static final EnumTrait DETECTOR_RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "DETECTOR_RAIL_SHAPE"); + public static final EnumTrait DARK_OAK_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_TRAPDOOR_FACING"); - public static final EnumTrait DIRT_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "DIRT_VARIANT"); + public static final EnumTrait DARK_OAK_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_TRAPDOOR_HALF"); - public static final EnumTrait DISPENSER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DISPENSER_FACING"); + public static final EnumTrait DARK_OAK_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "DARK_OAK_WOOD_AXIS"); + + public static final EnumTrait DARK_PRISMARINE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "DARK_PRISMARINE_SLAB_TYPE"); + + public static final EnumTrait DARK_PRISMARINE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DARK_PRISMARINE_STAIRS_FACING"); + + public static final EnumTrait DARK_PRISMARINE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "DARK_PRISMARINE_STAIRS_HALF"); + + public static final EnumTrait DARK_PRISMARINE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "DARK_PRISMARINE_STAIRS_SHAPE"); - public static final EnumTrait DOUBLE_PLANT_HALF = DummyObjectProvider.createFor(EnumTrait.class, "DOUBLE_PLANT_HALF"); + public static final EnumTrait DEAD_BRAIN_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DEAD_BRAIN_CORAL_WALL_FAN_FACING"); - public static final EnumTrait DOUBLE_PLANT_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "DOUBLE_PLANT_VARIANT"); + public static final EnumTrait DEAD_BUBBLE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DEAD_BUBBLE_CORAL_WALL_FAN_FACING"); - public static final EnumTrait DOUBLE_STONE_SLAB2_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "DOUBLE_STONE_SLAB2_VARIANT"); + public static final EnumTrait DEAD_FIRE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DEAD_FIRE_CORAL_WALL_FAN_FACING"); - public static final EnumTrait DOUBLE_STONE_SLAB_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "DOUBLE_STONE_SLAB_VARIANT"); + public static final EnumTrait DEAD_HORN_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DEAD_HORN_CORAL_WALL_FAN_FACING"); - public static final EnumTrait DOUBLE_WOODEN_SLAB_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "DOUBLE_WOODEN_SLAB_VARIANT"); + public static final EnumTrait DEAD_TUBE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DEAD_TUBE_CORAL_WALL_FAN_FACING"); + + public static final EnumTrait DETECTOR_RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "DETECTOR_RAIL_SHAPE"); + + public static final EnumTrait DISPENSER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DISPENSER_FACING"); + + public static final EnumTrait DRAGON_WALL_HEAD_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DRAGON_WALL_HEAD_FACING"); public static final EnumTrait DROPPER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "DROPPER_FACING"); @@ -122,18 +240,38 @@ public final class EnumTraits { public static final EnumTrait END_PORTAL_FRAME_FACING = DummyObjectProvider.createFor(EnumTrait.class, "END_PORTAL_FRAME_FACING"); - public static final EnumTrait FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "FENCE_GATE_FACING"); + public static final EnumTrait END_ROD_FACING = DummyObjectProvider.createFor(EnumTrait.class, "END_ROD_FACING"); - public static final EnumTrait FLOWER_POT_CONTENTS = DummyObjectProvider.createFor(EnumTrait.class, "FLOWER_POT_CONTENTS"); + public static final EnumTrait FIRE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "FIRE_CORAL_WALL_FAN_FACING"); public static final EnumTrait FURNACE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "FURNACE_FACING"); - public static final EnumTrait GOLDEN_RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "GOLDEN_RAIL_SHAPE"); + public static final EnumTrait GRAY_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GRAY_BED_FACING"); + + public static final EnumTrait GRAY_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "GRAY_BED_PART"); + + public static final EnumTrait GRAY_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GRAY_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait GRAY_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GRAY_SHULKER_BOX_FACING"); + + public static final EnumTrait GRAY_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GRAY_WALL_BANNER_FACING"); + + public static final EnumTrait GREEN_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GREEN_BED_FACING"); + + public static final EnumTrait GREEN_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "GREEN_BED_PART"); + + public static final EnumTrait GREEN_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GREEN_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait GREEN_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GREEN_SHULKER_BOX_FACING"); + + public static final EnumTrait GREEN_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "GREEN_WALL_BANNER_FACING"); public static final EnumTrait HAY_BLOCK_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "HAY_BLOCK_AXIS"); public static final EnumTrait HOPPER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "HOPPER_FACING"); + public static final EnumTrait HORN_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "HORN_CORAL_WALL_FAN_FACING"); + public static final EnumTrait IRON_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "IRON_DOOR_FACING"); public static final EnumTrait IRON_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "IRON_DOOR_HALF"); @@ -144,6 +282,12 @@ public final class EnumTraits { public static final EnumTrait IRON_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "IRON_TRAPDOOR_HALF"); + public static final EnumTrait JACK_O_LANTERN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JACK_O_LANTERN_FACING"); + + public static final EnumTrait JUNGLE_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_BUTTON_FACE"); + + public static final EnumTrait JUNGLE_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_BUTTON_FACING"); + public static final EnumTrait JUNGLE_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_DOOR_FACING"); public static final EnumTrait JUNGLE_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_DOOR_HALF"); @@ -152,35 +296,77 @@ public final class EnumTraits { public static final EnumTrait JUNGLE_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_FENCE_GATE_FACING"); + public static final EnumTrait JUNGLE_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_LOG_AXIS"); + + public static final EnumTrait JUNGLE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_SLAB_TYPE"); + public static final EnumTrait JUNGLE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_STAIRS_FACING"); public static final EnumTrait JUNGLE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_STAIRS_HALF"); public static final EnumTrait JUNGLE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_STAIRS_SHAPE"); + public static final EnumTrait JUNGLE_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_TRAPDOOR_FACING"); + + public static final EnumTrait JUNGLE_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_TRAPDOOR_HALF"); + + public static final EnumTrait JUNGLE_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "JUNGLE_WOOD_AXIS"); + public static final EnumTrait LADDER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LADDER_FACING"); - public static final EnumTrait LEAVES2_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "LEAVES2_VARIANT"); + public static final EnumTrait LARGE_FERN_HALF = DummyObjectProvider.createFor(EnumTrait.class, "LARGE_FERN_HALF"); - public static final EnumTrait LEAVES_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "LEAVES_VARIANT"); + public static final EnumTrait LEVER_FACE = DummyObjectProvider.createFor(EnumTrait.class, "LEVER_FACE"); public static final EnumTrait LEVER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LEVER_FACING"); - public static final EnumTrait LIT_FURNACE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIT_FURNACE_FACING"); + public static final EnumTrait LIGHT_BLUE_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_BLUE_BED_FACING"); + + public static final EnumTrait LIGHT_BLUE_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_BLUE_BED_PART"); + + public static final EnumTrait LIGHT_BLUE_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_BLUE_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait LIGHT_BLUE_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_BLUE_SHULKER_BOX_FACING"); + + public static final EnumTrait LIGHT_BLUE_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_BLUE_WALL_BANNER_FACING"); + + public static final EnumTrait LIGHT_GRAY_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_GRAY_BED_FACING"); + + public static final EnumTrait LIGHT_GRAY_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_GRAY_BED_PART"); + + public static final EnumTrait LIGHT_GRAY_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_GRAY_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait LIGHT_GRAY_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_GRAY_SHULKER_BOX_FACING"); + + public static final EnumTrait LIGHT_GRAY_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIGHT_GRAY_WALL_BANNER_FACING"); + + public static final EnumTrait LILAC_HALF = DummyObjectProvider.createFor(EnumTrait.class, "LILAC_HALF"); + + public static final EnumTrait LIME_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIME_BED_FACING"); + + public static final EnumTrait LIME_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "LIME_BED_PART"); + + public static final EnumTrait LIME_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIME_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait LIME_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIME_SHULKER_BOX_FACING"); + + public static final EnumTrait LIME_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIME_WALL_BANNER_FACING"); - public static final EnumTrait LIT_PUMPKIN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "LIT_PUMPKIN_FACING"); + public static final EnumTrait MAGENTA_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MAGENTA_BED_FACING"); - public static final EnumTrait LOG2_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "LOG2_AXIS"); + public static final EnumTrait MAGENTA_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "MAGENTA_BED_PART"); - public static final EnumTrait LOG2_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "LOG2_VARIANT"); + public static final EnumTrait MAGENTA_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MAGENTA_GLAZED_TERRACOTTA_FACING"); - public static final EnumTrait LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "LOG_AXIS"); + public static final EnumTrait MAGENTA_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MAGENTA_SHULKER_BOX_FACING"); - public static final EnumTrait LOG_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "LOG_VARIANT"); + public static final EnumTrait MAGENTA_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MAGENTA_WALL_BANNER_FACING"); - public static final EnumTrait MELON_STEM_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MELON_STEM_FACING"); + public static final EnumTrait MOVING_PISTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "MOVING_PISTON_FACING"); - public static final EnumTrait MONSTER_EGG_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "MONSTER_EGG_VARIANT"); + public static final EnumTrait MOVING_PISTON_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "MOVING_PISTON_TYPE"); + + public static final EnumTrait NETHER_BRICK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "NETHER_BRICK_SLAB_TYPE"); public static final EnumTrait NETHER_BRICK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "NETHER_BRICK_STAIRS_FACING"); @@ -188,15 +374,63 @@ public final class EnumTraits { public static final EnumTrait NETHER_BRICK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "NETHER_BRICK_STAIRS_SHAPE"); + public static final EnumTrait NETHER_PORTAL_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "NETHER_PORTAL_AXIS"); + + public static final EnumTrait NOTE_BLOCK_INSTRUMENT = DummyObjectProvider.createFor(EnumTrait.class, "NOTE_BLOCK_INSTRUMENT"); + + public static final EnumTrait OAK_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "OAK_BUTTON_FACE"); + + public static final EnumTrait OAK_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OAK_BUTTON_FACING"); + + public static final EnumTrait OAK_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OAK_DOOR_FACING"); + + public static final EnumTrait OAK_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "OAK_DOOR_HALF"); + + public static final EnumTrait OAK_DOOR_HINGE = DummyObjectProvider.createFor(EnumTrait.class, "OAK_DOOR_HINGE"); + + public static final EnumTrait OAK_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OAK_FENCE_GATE_FACING"); + + public static final EnumTrait OAK_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "OAK_LOG_AXIS"); + + public static final EnumTrait OAK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "OAK_SLAB_TYPE"); + public static final EnumTrait OAK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OAK_STAIRS_FACING"); public static final EnumTrait OAK_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "OAK_STAIRS_HALF"); public static final EnumTrait OAK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "OAK_STAIRS_SHAPE"); - public static final EnumTrait PISTON_EXTENSION_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PISTON_EXTENSION_FACING"); + public static final EnumTrait OAK_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OAK_TRAPDOOR_FACING"); + + public static final EnumTrait OAK_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "OAK_TRAPDOOR_HALF"); + + public static final EnumTrait OAK_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "OAK_WOOD_AXIS"); + + public static final EnumTrait OBSERVER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "OBSERVER_FACING"); + + public static final EnumTrait ORANGE_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ORANGE_BED_FACING"); + + public static final EnumTrait ORANGE_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "ORANGE_BED_PART"); + + public static final EnumTrait ORANGE_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ORANGE_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait ORANGE_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ORANGE_SHULKER_BOX_FACING"); + + public static final EnumTrait ORANGE_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ORANGE_WALL_BANNER_FACING"); - public static final EnumTrait PISTON_EXTENSION_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PISTON_EXTENSION_TYPE"); + public static final EnumTrait PEONY_HALF = DummyObjectProvider.createFor(EnumTrait.class, "PEONY_HALF"); + + public static final EnumTrait PETRIFIED_OAK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PETRIFIED_OAK_SLAB_TYPE"); + + public static final EnumTrait PINK_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PINK_BED_FACING"); + + public static final EnumTrait PINK_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "PINK_BED_PART"); + + public static final EnumTrait PINK_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PINK_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait PINK_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PINK_SHULKER_BOX_FACING"); + + public static final EnumTrait PINK_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PINK_WALL_BANNER_FACING"); public static final EnumTrait PISTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PISTON_FACING"); @@ -204,23 +438,49 @@ public final class EnumTraits { public static final EnumTrait PISTON_HEAD_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PISTON_HEAD_TYPE"); - public static final EnumTrait PLANKS_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "PLANKS_VARIANT"); + public static final EnumTrait PLAYER_WALL_HEAD_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PLAYER_WALL_HEAD_FACING"); + + public static final EnumTrait POWERED_RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "POWERED_RAIL_SHAPE"); + + public static final EnumTrait PRISMARINE_BRICK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_BRICK_SLAB_TYPE"); + + public static final EnumTrait PRISMARINE_BRICK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_BRICK_STAIRS_FACING"); + + public static final EnumTrait PRISMARINE_BRICK_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_BRICK_STAIRS_HALF"); + + public static final EnumTrait PRISMARINE_BRICK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_BRICK_STAIRS_SHAPE"); + + public static final EnumTrait PRISMARINE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_SLAB_TYPE"); + + public static final EnumTrait PRISMARINE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_STAIRS_FACING"); + + public static final EnumTrait PRISMARINE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_STAIRS_HALF"); + + public static final EnumTrait PRISMARINE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_STAIRS_SHAPE"); + + public static final EnumTrait PURPLE_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PURPLE_BED_FACING"); + + public static final EnumTrait PURPLE_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "PURPLE_BED_PART"); + + public static final EnumTrait PURPLE_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PURPLE_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait PURPLE_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PURPLE_SHULKER_BOX_FACING"); - public static final EnumTrait PORTAL_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "PORTAL_AXIS"); + public static final EnumTrait PURPLE_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PURPLE_WALL_BANNER_FACING"); - public static final EnumTrait POWERED_COMPARATOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "POWERED_COMPARATOR_FACING"); + public static final EnumTrait PURPUR_PILLAR_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "PURPUR_PILLAR_AXIS"); - public static final EnumTrait POWERED_COMPARATOR_MODE = DummyObjectProvider.createFor(EnumTrait.class, "POWERED_COMPARATOR_MODE"); + public static final EnumTrait PURPUR_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "PURPUR_SLAB_TYPE"); - public static final EnumTrait POWERED_REPEATER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "POWERED_REPEATER_FACING"); + public static final EnumTrait PURPUR_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PURPUR_STAIRS_FACING"); - public static final EnumTrait PRISMARINE_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "PRISMARINE_VARIANT"); + public static final EnumTrait PURPUR_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "PURPUR_STAIRS_HALF"); - public static final EnumTrait PUMPKIN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PUMPKIN_FACING"); + public static final EnumTrait PURPUR_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "PURPUR_STAIRS_SHAPE"); - public static final EnumTrait PUMPKIN_STEM_FACING = DummyObjectProvider.createFor(EnumTrait.class, "PUMPKIN_STEM_FACING"); + public static final EnumTrait QUARTZ_PILLAR_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "QUARTZ_PILLAR_AXIS"); - public static final EnumTrait QUARTZ_BLOCK_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "QUARTZ_BLOCK_VARIANT"); + public static final EnumTrait QUARTZ_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "QUARTZ_SLAB_TYPE"); public static final EnumTrait QUARTZ_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "QUARTZ_STAIRS_FACING"); @@ -230,7 +490,7 @@ public final class EnumTraits { public static final EnumTrait RAIL_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "RAIL_SHAPE"); - public static final EnumTrait REDSTONE_TORCH_FACING = DummyObjectProvider.createFor(EnumTrait.class, "REDSTONE_TORCH_FACING"); + public static final EnumTrait REDSTONE_WALL_TORCH_FACING = DummyObjectProvider.createFor(EnumTrait.class, "REDSTONE_WALL_TORCH_FACING"); public static final EnumTrait REDSTONE_WIRE_EAST = DummyObjectProvider.createFor(EnumTrait.class, "REDSTONE_WIRE_EAST"); @@ -240,9 +500,13 @@ public final class EnumTraits { public static final EnumTrait REDSTONE_WIRE_WEST = DummyObjectProvider.createFor(EnumTrait.class, "REDSTONE_WIRE_WEST"); - public static final EnumTrait RED_FLOWER_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "RED_FLOWER_TYPE"); + public static final EnumTrait RED_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "RED_BED_FACING"); - public static final EnumTrait RED_MUSHROOM_BLOCK_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "RED_MUSHROOM_BLOCK_VARIANT"); + public static final EnumTrait RED_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "RED_BED_PART"); + + public static final EnumTrait RED_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "RED_GLAZED_TERRACOTTA_FACING"); + + public static final EnumTrait RED_SANDSTONE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "RED_SANDSTONE_SLAB_TYPE"); public static final EnumTrait RED_SANDSTONE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "RED_SANDSTONE_STAIRS_FACING"); @@ -250,7 +514,17 @@ public final class EnumTraits { public static final EnumTrait RED_SANDSTONE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "RED_SANDSTONE_STAIRS_SHAPE"); - public static final EnumTrait RED_SANDSTONE_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "RED_SANDSTONE_TYPE"); + public static final EnumTrait RED_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "RED_SHULKER_BOX_FACING"); + + public static final EnumTrait RED_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "RED_WALL_BANNER_FACING"); + + public static final EnumTrait REPEATER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "REPEATER_FACING"); + + public static final EnumTrait REPEATING_COMMAND_BLOCK_FACING = DummyObjectProvider.createFor(EnumTrait.class, "REPEATING_COMMAND_BLOCK_FACING"); + + public static final EnumTrait ROSE_BUSH_HALF = DummyObjectProvider.createFor(EnumTrait.class, "ROSE_BUSH_HALF"); + + public static final EnumTrait SANDSTONE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "SANDSTONE_SLAB_TYPE"); public static final EnumTrait SANDSTONE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SANDSTONE_STAIRS_FACING"); @@ -258,13 +532,13 @@ public final class EnumTraits { public static final EnumTrait SANDSTONE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "SANDSTONE_STAIRS_SHAPE"); - public static final EnumTrait SANDSTONE_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "SANDSTONE_TYPE"); + public static final EnumTrait SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SHULKER_BOX_FACING"); - public static final EnumTrait SAND_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "SAND_VARIANT"); + public static final EnumTrait SKELETON_WALL_SKULL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SKELETON_WALL_SKULL_FACING"); - public static final EnumTrait SAPLING_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "SAPLING_TYPE"); + public static final EnumTrait SPRUCE_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_BUTTON_FACE"); - public static final EnumTrait SKULL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SKULL_FACING"); + public static final EnumTrait SPRUCE_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_BUTTON_FACING"); public static final EnumTrait SPRUCE_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_DOOR_FACING"); @@ -274,21 +548,25 @@ public final class EnumTraits { public static final EnumTrait SPRUCE_FENCE_GATE_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_FENCE_GATE_FACING"); + public static final EnumTrait SPRUCE_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_LOG_AXIS"); + + public static final EnumTrait SPRUCE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_SLAB_TYPE"); + public static final EnumTrait SPRUCE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_STAIRS_FACING"); public static final EnumTrait SPRUCE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_STAIRS_HALF"); public static final EnumTrait SPRUCE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_STAIRS_SHAPE"); - public static final EnumTrait STAINED_GLASS_COLOR = DummyObjectProvider.createFor(EnumTrait.class, "STAINED_GLASS_COLOR"); + public static final EnumTrait SPRUCE_TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_TRAPDOOR_FACING"); - public static final EnumTrait STAINED_GLASS_PANE_COLOR = DummyObjectProvider.createFor(EnumTrait.class, "STAINED_GLASS_PANE_COLOR"); + public static final EnumTrait SPRUCE_TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_TRAPDOOR_HALF"); - public static final EnumTrait STAINED_HARDENED_CLAY_COLOR = DummyObjectProvider.createFor(EnumTrait.class, "STAINED_HARDENED_CLAY_COLOR"); + public static final EnumTrait SPRUCE_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "SPRUCE_WOOD_AXIS"); public static final EnumTrait STICKY_PISTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "STICKY_PISTON_FACING"); - public static final EnumTrait STONEBRICK_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "STONEBRICK_VARIANT"); + public static final EnumTrait STONE_BRICK_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "STONE_BRICK_SLAB_TYPE"); public static final EnumTrait STONE_BRICK_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "STONE_BRICK_STAIRS_FACING"); @@ -296,63 +574,79 @@ public final class EnumTraits { public static final EnumTrait STONE_BRICK_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "STONE_BRICK_STAIRS_SHAPE"); + public static final EnumTrait STONE_BUTTON_FACE = DummyObjectProvider.createFor(EnumTrait.class, "STONE_BUTTON_FACE"); + public static final EnumTrait STONE_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "STONE_BUTTON_FACING"); - public static final EnumTrait STONE_SLAB2_HALF = DummyObjectProvider.createFor(EnumTrait.class, "STONE_SLAB2_HALF"); + public static final EnumTrait STONE_SLAB_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "STONE_SLAB_TYPE"); - public static final EnumTrait STONE_SLAB2_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "STONE_SLAB2_VARIANT"); + public static final EnumTrait STRIPPED_ACACIA_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_ACACIA_LOG_AXIS"); - public static final EnumTrait STONE_SLAB_HALF = DummyObjectProvider.createFor(EnumTrait.class, "STONE_SLAB_HALF"); + public static final EnumTrait STRIPPED_ACACIA_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_ACACIA_WOOD_AXIS"); - public static final EnumTrait STONE_SLAB_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "STONE_SLAB_VARIANT"); + public static final EnumTrait STRIPPED_BIRCH_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_BIRCH_LOG_AXIS"); - public static final EnumTrait STONE_STAIRS_FACING = DummyObjectProvider.createFor(EnumTrait.class, "STONE_STAIRS_FACING"); + public static final EnumTrait STRIPPED_BIRCH_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_BIRCH_WOOD_AXIS"); - public static final EnumTrait STONE_STAIRS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "STONE_STAIRS_HALF"); + public static final EnumTrait STRIPPED_DARK_OAK_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_DARK_OAK_LOG_AXIS"); - public static final EnumTrait STONE_STAIRS_SHAPE = DummyObjectProvider.createFor(EnumTrait.class, "STONE_STAIRS_SHAPE"); + public static final EnumTrait STRIPPED_DARK_OAK_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_DARK_OAK_WOOD_AXIS"); - public static final EnumTrait STONE_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "STONE_VARIANT"); + public static final EnumTrait STRIPPED_JUNGLE_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_JUNGLE_LOG_AXIS"); - public static final EnumTrait TALLGRASS_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "TALLGRASS_TYPE"); + public static final EnumTrait STRIPPED_JUNGLE_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_JUNGLE_WOOD_AXIS"); - public static final EnumTrait TORCH_FACING = DummyObjectProvider.createFor(EnumTrait.class, "TORCH_FACING"); + public static final EnumTrait STRIPPED_OAK_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_OAK_LOG_AXIS"); - public static final EnumTrait TRAPDOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "TRAPDOOR_FACING"); + public static final EnumTrait STRIPPED_OAK_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_OAK_WOOD_AXIS"); - public static final EnumTrait TRAPDOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "TRAPDOOR_HALF"); + public static final EnumTrait STRIPPED_SPRUCE_LOG_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_SPRUCE_LOG_AXIS"); + + public static final EnumTrait STRIPPED_SPRUCE_WOOD_AXIS = DummyObjectProvider.createFor(EnumTrait.class, "STRIPPED_SPRUCE_WOOD_AXIS"); + + public static final EnumTrait STRUCTURE_BLOCK_MODE = DummyObjectProvider.createFor(EnumTrait.class, "STRUCTURE_BLOCK_MODE"); + + public static final EnumTrait SUNFLOWER_HALF = DummyObjectProvider.createFor(EnumTrait.class, "SUNFLOWER_HALF"); + + public static final EnumTrait TALL_GRASS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "TALL_GRASS_HALF"); + + public static final EnumTrait TALL_SEAGRASS_HALF = DummyObjectProvider.createFor(EnumTrait.class, "TALL_SEAGRASS_HALF"); public static final EnumTrait TRAPPED_CHEST_FACING = DummyObjectProvider.createFor(EnumTrait.class, "TRAPPED_CHEST_FACING"); + public static final EnumTrait TRAPPED_CHEST_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "TRAPPED_CHEST_TYPE"); + public static final EnumTrait TRIPWIRE_HOOK_FACING = DummyObjectProvider.createFor(EnumTrait.class, "TRIPWIRE_HOOK_FACING"); - public static final EnumTrait UNLIT_REDSTONE_TORCH_FACING = DummyObjectProvider.createFor(EnumTrait.class, "UNLIT_REDSTONE_TORCH_FACING"); + public static final EnumTrait TUBE_CORAL_WALL_FAN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "TUBE_CORAL_WALL_FAN_FACING"); + + public static final EnumTrait WALL_SIGN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WALL_SIGN_FACING"); - public static final EnumTrait UNPOWERED_COMPARATOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "UNPOWERED_COMPARATOR_FACING"); + public static final EnumTrait WALL_TORCH_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WALL_TORCH_FACING"); - public static final EnumTrait UNPOWERED_COMPARATOR_MODE = DummyObjectProvider.createFor(EnumTrait.class, "UNPOWERED_COMPARATOR_MODE"); + public static final EnumTrait WHITE_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WHITE_BED_FACING"); - public static final EnumTrait UNPOWERED_REPEATER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "UNPOWERED_REPEATER_FACING"); + public static final EnumTrait WHITE_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "WHITE_BED_PART"); - public static final EnumTrait WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WALL_BANNER_FACING"); + public static final EnumTrait WHITE_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WHITE_GLAZED_TERRACOTTA_FACING"); - public static final EnumTrait WALL_SIGN_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WALL_SIGN_FACING"); + public static final EnumTrait WHITE_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WHITE_SHULKER_BOX_FACING"); - public static final EnumTrait WOODEN_BUTTON_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_BUTTON_FACING"); + public static final EnumTrait WHITE_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WHITE_WALL_BANNER_FACING"); - public static final EnumTrait WOODEN_DOOR_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_DOOR_FACING"); + public static final EnumTrait WITHER_SKELETON_WALL_SKULL_FACING = DummyObjectProvider.createFor(EnumTrait.class, "WITHER_SKELETON_WALL_SKULL_FACING"); - public static final EnumTrait WOODEN_DOOR_HALF = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_DOOR_HALF"); + public static final EnumTrait YELLOW_BED_FACING = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_BED_FACING"); - public static final EnumTrait WOODEN_DOOR_HINGE = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_DOOR_HINGE"); + public static final EnumTrait YELLOW_BED_PART = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_BED_PART"); - public static final EnumTrait WOODEN_SLAB_HALF = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_SLAB_HALF"); + public static final EnumTrait YELLOW_GLAZED_TERRACOTTA_FACING = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_GLAZED_TERRACOTTA_FACING"); - public static final EnumTrait WOODEN_SLAB_VARIANT = DummyObjectProvider.createFor(EnumTrait.class, "WOODEN_SLAB_VARIANT"); + public static final EnumTrait YELLOW_SHULKER_BOX_FACING = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_SHULKER_BOX_FACING"); - public static final EnumTrait WOOL_COLOR = DummyObjectProvider.createFor(EnumTrait.class, "WOOL_COLOR"); + public static final EnumTrait YELLOW_WALL_BANNER_FACING = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_WALL_BANNER_FACING"); - public static final EnumTrait YELLOW_FLOWER_TYPE = DummyObjectProvider.createFor(EnumTrait.class, "YELLOW_FLOWER_TYPE"); + public static final EnumTrait ZOMBIE_WALL_HEAD_FACING = DummyObjectProvider.createFor(EnumTrait.class, "ZOMBIE_WALL_HEAD_FACING"); // SORTFIELDS:OFF diff --git a/src/main/java/org/spongepowered/api/block/trait/IntegerTraits.java b/src/main/java/org/spongepowered/api/block/trait/IntegerTraits.java index f2a6ca5af11..40b00234554 100644 --- a/src/main/java/org/spongepowered/api/block/trait/IntegerTraits.java +++ b/src/main/java/org/spongepowered/api/block/trait/IntegerTraits.java @@ -34,7 +34,21 @@ public final class IntegerTraits { // SORTFIELDS:ON - public static final IntegerTrait ANVIL_DAMAGE = DummyObjectProvider.createFor(IntegerTrait.class, "ANVIL_DAMAGE"); + public static final IntegerTrait ACACIA_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "ACACIA_LEAVES_DISTANCE"); + + public static final IntegerTrait ACACIA_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "ACACIA_SAPLING_STAGE"); + + public static final IntegerTrait BEETROOTS_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "BEETROOTS_AGE"); + + public static final IntegerTrait BIRCH_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "BIRCH_LEAVES_DISTANCE"); + + public static final IntegerTrait BIRCH_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "BIRCH_SAPLING_STAGE"); + + public static final IntegerTrait BLACK_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "BLACK_BANNER_ROTATION"); + + public static final IntegerTrait BLUE_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "BLUE_BANNER_ROTATION"); + + public static final IntegerTrait BROWN_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "BROWN_BANNER_ROTATION"); public static final IntegerTrait CACTUS_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "CACTUS_AGE"); @@ -44,56 +58,110 @@ public final class IntegerTraits { public static final IntegerTrait CAULDRON_LEVEL = DummyObjectProvider.createFor(IntegerTrait.class, "CAULDRON_LEVEL"); + public static final IntegerTrait CHORUS_FLOWER_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "CHORUS_FLOWER_AGE"); + public static final IntegerTrait COCOA_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "COCOA_AGE"); - public static final IntegerTrait DAYLIGHT_DETECTOR_INVERTED_POWER = DummyObjectProvider.createFor(IntegerTrait.class, "DAYLIGHT_DETECTOR_INVERTED_POWER"); + public static final IntegerTrait CREEPER_HEAD_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "CREEPER_HEAD_ROTATION"); + + public static final IntegerTrait CYAN_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "CYAN_BANNER_ROTATION"); + + public static final IntegerTrait DARK_OAK_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "DARK_OAK_LEAVES_DISTANCE"); + + public static final IntegerTrait DARK_OAK_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "DARK_OAK_SAPLING_STAGE"); public static final IntegerTrait DAYLIGHT_DETECTOR_POWER = DummyObjectProvider.createFor(IntegerTrait.class, "DAYLIGHT_DETECTOR_POWER"); + public static final IntegerTrait DRAGON_HEAD_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "DRAGON_HEAD_ROTATION"); + public static final IntegerTrait FARMLAND_MOISTURE = DummyObjectProvider.createFor(IntegerTrait.class, "FARMLAND_MOISTURE"); public static final IntegerTrait FIRE_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "FIRE_AGE"); - public static final IntegerTrait FLOWER_POT_LEGACY_DATA = DummyObjectProvider.createFor(IntegerTrait.class, "FLOWER_POT_LEGACY_DATA"); + public static final IntegerTrait FROSTED_ICE_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "FROSTED_ICE_AGE"); - public static final IntegerTrait FLOWING_LAVA_LEVEL = DummyObjectProvider.createFor(IntegerTrait.class, "FLOWING_LAVA_LEVEL"); + public static final IntegerTrait GRAY_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "GRAY_BANNER_ROTATION"); - public static final IntegerTrait FLOWING_WATER_LEVEL = DummyObjectProvider.createFor(IntegerTrait.class, "FLOWING_WATER_LEVEL"); + public static final IntegerTrait GREEN_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "GREEN_BANNER_ROTATION"); public static final IntegerTrait HEAVY_WEIGHTED_PRESSURE_PLATE_POWER = DummyObjectProvider.createFor(IntegerTrait.class, "HEAVY_WEIGHTED_PRESSURE_PLATE_POWER"); + public static final IntegerTrait JUNGLE_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "JUNGLE_LEAVES_DISTANCE"); + + public static final IntegerTrait JUNGLE_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "JUNGLE_SAPLING_STAGE"); + + public static final IntegerTrait KELP_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "KELP_AGE"); + public static final IntegerTrait LAVA_LEVEL = DummyObjectProvider.createFor(IntegerTrait.class, "LAVA_LEVEL"); + public static final IntegerTrait LIGHT_BLUE_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "LIGHT_BLUE_BANNER_ROTATION"); + + public static final IntegerTrait LIGHT_GRAY_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "LIGHT_GRAY_BANNER_ROTATION"); + public static final IntegerTrait LIGHT_WEIGHTED_PRESSURE_PLATE_POWER = DummyObjectProvider.createFor(IntegerTrait.class, "LIGHT_WEIGHTED_PRESSURE_PLATE_POWER"); + public static final IntegerTrait LIME_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "LIME_BANNER_ROTATION"); + + public static final IntegerTrait MAGENTA_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "MAGENTA_BANNER_ROTATION"); + public static final IntegerTrait MELON_STEM_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "MELON_STEM_AGE"); public static final IntegerTrait NETHER_WART_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "NETHER_WART_AGE"); - public static final IntegerTrait POTATOES_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "POTATOES_AGE"); + public static final IntegerTrait NOTE_BLOCK_NOTE = DummyObjectProvider.createFor(IntegerTrait.class, "NOTE_BLOCK_NOTE"); + + public static final IntegerTrait OAK_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "OAK_LEAVES_DISTANCE"); + + public static final IntegerTrait OAK_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "OAK_SAPLING_STAGE"); + + public static final IntegerTrait ORANGE_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "ORANGE_BANNER_ROTATION"); - public static final IntegerTrait POWERED_REPEATER_DELAY = DummyObjectProvider.createFor(IntegerTrait.class, "POWERED_REPEATER_DELAY"); + public static final IntegerTrait PINK_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "PINK_BANNER_ROTATION"); + + public static final IntegerTrait PLAYER_HEAD_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "PLAYER_HEAD_ROTATION"); + + public static final IntegerTrait POTATOES_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "POTATOES_AGE"); public static final IntegerTrait PUMPKIN_STEM_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "PUMPKIN_STEM_AGE"); + public static final IntegerTrait PURPLE_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "PURPLE_BANNER_ROTATION"); + public static final IntegerTrait REDSTONE_WIRE_POWER = DummyObjectProvider.createFor(IntegerTrait.class, "REDSTONE_WIRE_POWER"); - public static final IntegerTrait REEDS_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "REEDS_AGE"); + public static final IntegerTrait RED_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "RED_BANNER_ROTATION"); - public static final IntegerTrait SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "SAPLING_STAGE"); + public static final IntegerTrait REPEATER_DELAY = DummyObjectProvider.createFor(IntegerTrait.class, "REPEATER_DELAY"); - public static final IntegerTrait SNOW_LAYER_LAYERS = DummyObjectProvider.createFor(IntegerTrait.class, "SNOW_LAYER_LAYERS"); + public static final IntegerTrait SEA_PICKLE_PICKLES = DummyObjectProvider.createFor(IntegerTrait.class, "SEA_PICKLE_PICKLES"); - public static final IntegerTrait STANDING_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "STANDING_BANNER_ROTATION"); + public static final IntegerTrait SIGN_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "SIGN_ROTATION"); - public static final IntegerTrait STANDING_SIGN_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "STANDING_SIGN_ROTATION"); + public static final IntegerTrait SKELETON_SKULL_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "SKELETON_SKULL_ROTATION"); - public static final IntegerTrait UNPOWERED_REPEATER_DELAY = DummyObjectProvider.createFor(IntegerTrait.class, "UNPOWERED_REPEATER_DELAY"); + public static final IntegerTrait SNOW_LAYERS = DummyObjectProvider.createFor(IntegerTrait.class, "SNOW_LAYERS"); + + public static final IntegerTrait SPRUCE_LEAVES_DISTANCE = DummyObjectProvider.createFor(IntegerTrait.class, "SPRUCE_LEAVES_DISTANCE"); + + public static final IntegerTrait SPRUCE_SAPLING_STAGE = DummyObjectProvider.createFor(IntegerTrait.class, "SPRUCE_SAPLING_STAGE"); + + public static final IntegerTrait SUGAR_CANE_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "SUGAR_CANE_AGE"); + + public static final IntegerTrait TURTLE_EGG_EGGS = DummyObjectProvider.createFor(IntegerTrait.class, "TURTLE_EGG_EGGS"); + + public static final IntegerTrait TURTLE_EGG_HATCH = DummyObjectProvider.createFor(IntegerTrait.class, "TURTLE_EGG_HATCH"); public static final IntegerTrait WATER_LEVEL = DummyObjectProvider.createFor(IntegerTrait.class, "WATER_LEVEL"); public static final IntegerTrait WHEAT_AGE = DummyObjectProvider.createFor(IntegerTrait.class, "WHEAT_AGE"); + public static final IntegerTrait WHITE_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "WHITE_BANNER_ROTATION"); + + public static final IntegerTrait WITHER_SKELETON_SKULL_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "WITHER_SKELETON_SKULL_ROTATION"); + + public static final IntegerTrait YELLOW_BANNER_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "YELLOW_BANNER_ROTATION"); + + public static final IntegerTrait ZOMBIE_HEAD_ROTATION = DummyObjectProvider.createFor(IntegerTrait.class, "ZOMBIE_HEAD_ROTATION"); + // SORTFIELDS:OFF // Suppress default constructor to ensure non-instantiability. diff --git a/src/main/java/org/spongepowered/api/data/key/Keys.java b/src/main/java/org/spongepowered/api/data/key/Keys.java index 52202cbc537..39eaa26a8f3 100644 --- a/src/main/java/org/spongepowered/api/data/key/Keys.java +++ b/src/main/java/org/spongepowered/api/data/key/Keys.java @@ -282,6 +282,14 @@ public final class Keys { */ public static final Key> ATTACHED = DummyObjectProvider.createExtendedFor(Key.class,"ATTACHED"); + /** + * Represents the {@link Key} for the attachment {@link Surface} + * of a button or lever. + * + * @see SurfaceAttachmentData + */ + public static final Key> ATTACHMENT_SURFACE = DummyObjectProvider.createExtendedFor(Key.class,"ATTACHMENT_SURFACE"); + /** * Represents the {@link Key} for the damage dealt by a * {@link DamagingProjectile}, e.g. an {@link Arrow}. @@ -348,12 +356,67 @@ public final class Keys { public static final Key> BEACON_SECONDARY_EFFECT = DummyObjectProvider.createExtendedFor(Key.class,"BEACON_SECONDARY_EFFECT"); /** - * Represents the {@link Key} for representing the {@link BigMushroomType} - * of a {@link BlockState}. + * Represents the {@link Key} for the pore sides + * of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. * - * @see BigMushroomData + * @see BigMushroomPoresData#sides() */ - public static final Key> BIG_MUSHROOM_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_TYPE"); + public static final Key> BIG_MUSHROOM_PORES = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES"); + + /** + * Represents the {@link Key} for the {@link Direction#DOWN} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#down() + */ + public static final Key> BIG_MUSHROOM_PORES_DOWN = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_DOWN"); + + /** + * Represents the {@link Key} for the {@link Direction#EAST} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#east() + */ + public static final Key> BIG_MUSHROOM_PORES_EAST = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_EAST"); + + /** + * Represents the {@link Key} for the {@link Direction#NORTH} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#north() + */ + public static final Key> BIG_MUSHROOM_PORES_NORTH = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_NORTH"); + + /** + * Represents the {@link Key} for the {@link Direction#SOUTH} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#south() + */ + public static final Key> BIG_MUSHROOM_PORES_SOUTH = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_SOUTH"); + + /** + * Represents the {@link Key} for the {@link Direction#UP} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#up() + */ + public static final Key> BIG_MUSHROOM_PORES_UP = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_UP"); + + /** + * Represents the {@link Key} for the {@link Direction#WEST} + * pores side of a {@link BlockTypes#BROWN_MUSHROOM_BLOCK} or + * {@link BlockTypes#RED_MUSHROOM_BLOCK} {@link BlockState}. + * + * @see BigMushroomPoresData#west() + */ + public static final Key> BIG_MUSHROOM_PORES_WEST = DummyObjectProvider.createExtendedFor(Key.class,"BIG_MUSHROOM_PORES_WEST"); /** * Represents the {@link Key} for the rotation of specific body parts. @@ -391,14 +454,6 @@ public final class Keys { */ public static final Key> BREAKABLE_BLOCK_TYPES = DummyObjectProvider.createExtendedFor(Key.class,"BREAKABLE_BLOCK_TYPES"); - /** - * Represents the {@link Key} for representing the {@link BrickType} - * of a {@link BlockState}. - * - * @see BrickData - */ - public static final Key> BRICK_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"BRICK_TYPE"); - /** * Represents the {@link Key} for whether an {@link Entity} can breed. * @@ -449,21 +504,20 @@ public final class Keys { public static final Key> CAREER = DummyObjectProvider.createExtendedFor(Key.class,"CAREER"); /** - * Represents the {@link Key} for the rotation of the - * {@link BodyParts#CHEST}. + * Represents the {@link Key} for the attachment of a {@link BlockTypes#CHEST} + * or {@link BlockTypes#TRAPPED_CHEST). * - * @see BodyPartRotationalData#bodyRotation() + * @see ChestAttachmentData */ - public static final Key> CHEST_ROTATION = DummyObjectProvider.createExtendedFor(Key.class,"CHEST_ROTATION"); + public static final Key> CHEST_ATTACHMENT = DummyObjectProvider.createExtendedFor(Key.class,"CHEST_ATTACHMENT"); /** - * Represents the {@link Key} for the {@link CoalType} of an - * {@link ItemStack} or {@link ItemStackSnapshot} of type - * {@link ItemTypes#COAL}. + * Represents the {@link Key} for the rotation of the + * {@link BodyParts#CHEST}. * - * @see CoalData + * @see BodyPartRotationalData#bodyRotation() */ - public static final Key> COAL_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"COAL_TYPE"); + public static final Key> CHEST_ROTATION = DummyObjectProvider.createExtendedFor(Key.class,"CHEST_ROTATION"); /** * Represents the {@link Key} for the {@link Color} of an @@ -537,14 +591,6 @@ public final class Keys { */ public static final Key> CONTAINED_EXPERIENCE = DummyObjectProvider.createExtendedFor(Key.class,"CONTAINED_EXPERIENCE"); - /** - * Represents the {@link Key} for the type of {@link CookedFish} an - * {@link ItemStack} with {@link ItemTypes#COOKED_FISH} has. - * - * @see CookedFishData - */ - public static final Key> COOKED_FISH = DummyObjectProvider.createExtendedFor(Key.class,"COOKED_FISH"); - /** * Represents the {@link Key} for the amount of ticks a {@link Hopper} has * to cool down before transferring the next item. @@ -586,12 +632,12 @@ public final class Keys { public static final Key> DAMAGE_ENTITY_MAP = DummyObjectProvider.createExtendedFor(Key.class,"DAMAGE_ENTITY_MAP"); /** - * Represents the {@link Key} for representing whether a {@link BlockState} - * will decay. This usually applies to {@link BlockTypes#LEAVES}. + * Represents the {@link Key} for representing at which distance a {@link BlockState} + * will decay. This usually applies to leaves, for example {@link BlockTypes#OAK_LEAVES}. * - * @see DecayableData#decayable() + * @see DecayableData#distance() */ - public static final Key> DECAYABLE = DummyObjectProvider.createExtendedFor(Key.class,"DECAYABLE"); + public static final Key> DECAY_DISTANCE = DummyObjectProvider.createExtendedFor(Key.class,"DECAY_DISTANCE"); /** * Represents the {@link Key} for the delay on a redstone repeater. @@ -616,14 +662,6 @@ public final class Keys { */ public static final Key> DIRECTION = DummyObjectProvider.createExtendedFor(Key.class,"DIRECTION"); - /** - * Represents the {@link Key} for representing the {@link DirtType} - * of a {@link BlockState}. - * - * @see DirtData - */ - public static final Key> DIRT_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"DIRT_TYPE"); - /** * Represents the {@link Key} for representing the "disarmed" state * of a {@link BlockState}. This usually applies to @@ -633,14 +671,6 @@ public final class Keys { */ public static final Key> DISARMED = DummyObjectProvider.createExtendedFor(Key.class,"DISARMED"); - /** - * Represents the {@link Key} for representing the {@link DisguisedBlockType} - * of a {@link BlockState}. - * - * @see DisguisedBlockData - */ - public static final Key> DISGUISED_BLOCK_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"DISGUISED_BLOCK_TYPE"); - /** * Represents the {@link Key} for the display name of an {@link Entity}, * {@link ItemStack} or {@link TileEntity}. @@ -664,14 +694,6 @@ public final class Keys { */ public static final Key> DOMINANT_HAND = DummyObjectProvider.createExtendedFor(Key.class,"DOMINANT_HAND"); - /** - * Represents the {@link Key} for representing the {@link DoublePlantType} - * of a {@link BlockState}. - * - * @see DoublePlantData - */ - public static final Key> DOUBLE_PLANT_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"DOUBLE_PLANT_TYPE"); - /** * Represents the {@link Key} for the color of a dyeable block, item or * entity. @@ -831,7 +853,7 @@ public final class Keys { /** * Represents the {@link Key} for the {@link FireworkEffect}s of a - * {@link ItemTypes#FIREWORK_CHARGE}, {@link ItemTypes#FIREWORKS} or a + * {@link ItemTypes#FIREWORK_STAR}, {@link ItemTypes#FIREWORK_ROCKET} or a * {@link Firework}. * * @see FireworkEffectData#effects() @@ -873,17 +895,6 @@ public final class Keys { */ public static final Key> FIRST_DATE_PLAYED = DummyObjectProvider.createExtendedFor(Key.class,"FIRST_DATE_PLAYED"); - /** - * Represents the {@link Key} for the {@link Fish} type an {@link Item} or - * {@link ItemStack} may have. - * - *

Only for {@link ItemTypes#FISH}, for {@link ItemTypes#COOKED_FISH} - * see {@link #COOKED_FISH}.

- * - * @see FishData - */ - public static final Key> FISH_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"FISH_TYPE"); - /** * Represents the {@link Key} for representing the * {@link FluidStackSnapshot} contained within an item container. Item @@ -956,14 +967,6 @@ public final class Keys { */ public static final Key> GLOWING = DummyObjectProvider.createExtendedFor(Key.class,"GLOWING"); - /** - * Represents the {@link Key} for the type of a - * {@link ItemTypes#GOLDEN_APPLE}. - * - * @see GoldenAppleData - */ - public static final Key> GOLDEN_APPLE_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"GOLDEN_APPLE_TYPE"); - /** * Represents the {@link Key} for representing the "growth stage" state * of a {@link BlockState}. @@ -1100,6 +1103,22 @@ public final class Keys { */ public static final Key> INFINITE_PICKUP_DELAY = DummyObjectProvider.createExtendedFor(Key.class,"INFINITE_PICKUP_DELAY"); + /** + * Represents the {@link Key} for the {@link InstrumentType} + * of a {@link BlockTypes#NOTE_BLOCK}. + * + * @see InstrumentData + */ + public static final Key> INSTRUMENT = DummyObjectProvider.createExtendedFor(Key.class, "INSTRUMENT"); + + /** + * Represents the {@link Key} for the "inverted" state of + * an {@link BlockTypes#DAYLIGHT_DETECTOR}. + * + * @see InvertibleData#inverted() + */ + public static final Key> INVERTED = DummyObjectProvider.createExtendedFor(Key.class,"INVERTED"); + /** * Represents the {@link Key} for representing the "vanish" state * of an {@link Entity}. This will only simply render the entity as @@ -1131,7 +1150,7 @@ public final class Keys { /** * Represents the {@link Key} for representing the "in-wall" state of - * {@link BlockTypes#FENCE}s. + * fences, for example {@link BlockTypes#OAK_FENCE}. * * @see InWallData#inWall() */ @@ -1358,7 +1377,7 @@ public final class Keys { /** * Represents the {@link Key} for representing the "layer" value of - * {@link BlockTypes#SNOW_LAYER} and other possible layered blocks. + * {@link BlockTypes#SNOW} and other possible layered blocks. * * @see LayeredData#layer() */ @@ -1380,6 +1399,14 @@ public final class Keys { */ public static final Key> LEFT_LEG_ROTATION = DummyObjectProvider.createExtendedFor(Key.class,"LEFT_LEG_ROTATION"); + /** + * Represents the {@link Key} for the state that something is "lit", + * for example a {@link BlockTypes#FURNACE} or {@link BlockTypes#REDSTONE_TORCH}. + * + * @see LitData#lit() + */ + public static final Key> LIT = DummyObjectProvider.createExtendedFor(Key.class,"LIT"); + /** * Represents the {@link Key} for a {@link Llama}s carrying strength. The higher the strength, * the more items it can carry (effectively the size of inventory). @@ -1399,16 +1426,6 @@ public final class Keys { */ public static final Key> LOCK_TOKEN = DummyObjectProvider.createExtendedFor(Key.class,"LOCK_TOKEN"); - /** - * Represents the {@link Key} for the axis of a {@link BlockTypes#LOG}. - * - *

It differs from {@link #AXIS} in that a log axis may also be - * {@link LogAxes#NONE}.

- * - * @see LogAxisData - */ - public static final Key> LOG_AXIS = DummyObjectProvider.createExtendedFor(Key.class,"LOG_AXIS"); - /** * Represents the {@link Key} for the maximum air supply a {@link Living} * may have. @@ -1459,7 +1476,7 @@ public final class Keys { public static final Key> MOISTURE = DummyObjectProvider.createExtendedFor(Key.class,"MOISTURE"); /** - * Represents the {@link Key} for the pitch of a {@link Note} block. + * Represents the {@link Key} for the pitch of a {@link BlockTypes#NOTE_BLOCK}. * * @see NoteData#note() */ @@ -1467,7 +1484,7 @@ public final class Keys { /** * Represents the {@link Key} for representing the "occupied" state of - * {@link BlockTypes#BED}. + * beds, for example {@link BlockTypes#WHITE_BED}. * * @see OccupiedData#occupied() */ @@ -1537,16 +1554,16 @@ public final class Keys { public static final Key> PASSENGERS = DummyObjectProvider.createExtendedFor(Key.class,"PASSENGERS"); /** - * Represents the {@link Key} for whether an {@link Entity} will be - * prevented from despawning. + * Represents the {@link Key} for whether an {@link Entity} or + * {@link BlockState} will be prevented from despawning/decaying. * *

In Vanilla, entities may despawn if the player moves too far from * them. A persisting entity will not be removed due to no players being * near it.

* - * @see PersistingData#persists() + * @see PersistingData#persistent() */ - public static final Key> PERSISTS = DummyObjectProvider.createExtendedFor(Key.class,"PERSISTS"); + public static final Key> PERSISTENT = DummyObjectProvider.createExtendedFor(Key.class,"PERSISTENT"); /** * Represents the {@link Key} for representing the pickup delay @@ -1570,14 +1587,6 @@ public final class Keys { */ public static final Key> PIG_SADDLE = DummyObjectProvider.createExtendedFor(Key.class,"PIG_SADDLE"); - /** - * Represents the {@link Key} for representing the {@link PistonType} - * of a {@link BlockTypes#PISTON}. - * - * @see PistonData - */ - public static final Key> PISTON_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"PISTON_TYPE"); - /** * Represents the {@link Key} for which block types an {@link ItemStack} * may be placed on. @@ -1586,14 +1595,6 @@ public final class Keys { */ public static final Key> PLACEABLE_BLOCKS = DummyObjectProvider.createExtendedFor(Key.class,"PLACEABLE_BLOCKS"); - /** - * Represents the {@link Key} for representing the {@link PlantType} - * of a {@link BlockState}. - * - * @see PlantData - */ - public static final Key> PLANT_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"PLANT_TYPE"); - /** * Represents the {@link Key} for whether an {@link IronGolem} has been * created by a {@link Player}. @@ -1637,30 +1638,14 @@ public final class Keys { * *

Applies to blocks that may be powered in order to emit a * Redstone signal of consistently maximum strength, such as - * {@link BlockTypes#LEVER}, {@link BlockTypes#WOODEN_BUTTON}, - * {@link BlockTypes#WOODEN_PRESSURE_PLATE}, and their stone + * {@link BlockTypes#LEVER}, {@link BlockTypes#OAK_BUTTON}, + * {@link BlockTypes#OAK_PRESSURE_PLATE}, and their stone * counterparts.

* * @see PoweredData#powered() */ public static final Key> POWERED = DummyObjectProvider.createExtendedFor(Key.class,"POWERED"); - /** - * Represents the {@link Key} for representing the {@link PrismarineType} - * of a {@link BlockState}. - * - * @see PrismarineData - */ - public static final Key> PRISMARINE_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"PRISMARINE_TYPE"); - - /** - * Represents the {@link Key} for representing the {@link QuartzType} - * of a {@link BlockState}. - * - * @see QuartzData - */ - public static final Key> QUARTZ_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"QUARTZ_TYPE"); - /** * Represents the {@link Key} for the type of a {@link Rabbit}. * @@ -1711,10 +1696,8 @@ public final class Keys { /** * Represents the {@link Key} for the player represented by a - * {@link BlockTypes#SKULL} block or a {@link ItemTypes#SKULL} item stack. - * - *

This will have no effect unless the {@link #SKULL_TYPE} is set to - * {@link SkullTypes#PLAYER}.

+ * {@link BlockTypes#PLAYER_HEAD} (and {@link BlockTypes#PLAYER_WALL_HEAD}) + * block or a {@link ItemTypes#PLAYER_HEAD} item stack. * * @see RepresentedPlayerData#owner() */ @@ -1752,22 +1735,6 @@ public final class Keys { */ public static final Key> ROTATION = DummyObjectProvider.createExtendedFor(Key.class,"ROTATION"); - /** - * Represents the {@link Key} for representing the {@link SandstoneType} - * of a {@link BlockState}. - * - * @see SandstoneData - */ - public static final Key> SANDSTONE_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SANDSTONE_TYPE"); - - /** - * Represents the {@link Key} for representing the {@link SandType} - * of a {@link BlockState}. - * - * @see SandData - */ - public static final Key> SAND_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SAND_TYPE"); - /** * Represents the {@link Key} for the current saturation of a {@link Living}. * @@ -1786,14 +1753,6 @@ public final class Keys { */ public static final Key> SCALE = DummyObjectProvider.createExtendedFor(Key.class,"SCALE"); - /** - * Represents the {@link Key} for representing the "seamless" state - * of a {@link BlockState}. - * - * @see SeamlessData#seamless() - */ - public static final Key> SEAMLESS = DummyObjectProvider.createExtendedFor(Key.class,"SEAMLESS"); - /** * Represents the {@link Key} for representing the "should drop" state * of a {@link BlockState}. @@ -1802,14 +1761,6 @@ public final class Keys { */ public static final Key> SHOULD_DROP = DummyObjectProvider.createExtendedFor(Key.class,"SHOULD_DROP"); - /** - * Represents the {@link Key} for representing the {@link ShrubType} - * of a {@link BlockState}. - * - * @see ShrubData - */ - public static final Key> SHRUB_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SHRUB_TYPE"); - /** * Represents the {@link Key} for the lines displayed on a {@link Sign}. * @@ -1838,20 +1789,12 @@ public final class Keys { public static final Key> UPDATE_GAME_PROFILE = DummyObjectProvider.createExtendedFor(Key.class, "UPDATE_GAME_PROFILE"); /** - * Represents the {@link Key} for the type of skull a block or item stack - * has. - * - * @see SkullData - */ - public static final Key> SKULL_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SKULL_TYPE"); - - /** - * Represents the {@link Key} for representing the {@link SlabType} + * Represents the {@link Key} for representing the {@link SlabPortion} * of a {@link BlockState}. * - * @see SlabData + * @see SlabPortionData */ - public static final Key> SLAB_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SLAB_TYPE"); + public static final Key> SLAB_PORTION = DummyObjectProvider.createExtendedFor(Key.class,"SLAB_PORTION"); /** * Represents the {@link Key} for the size of a {@link Slime}. @@ -1877,6 +1820,7 @@ public final class Keys { * * @see SpawnableData */ + // TODO public static final Key> SPAWNABLE_ENTITY_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"SPAWNABLE_ENTITY_TYPE"); /** @@ -1972,14 +1916,6 @@ public final class Keys { */ public static final Key> STATISTICS = DummyObjectProvider.createExtendedFor(Key.class,"STATISTICS"); - /** - * Represents the {@link Key} for representing the {@link StoneType} - * of a {@link BlockState}. - * - * @see StoneData - */ - public static final Key> STONE_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"STONE_TYPE"); - /** * Represents the {@link Key} for the enchantments stored on an * {@link ItemStack}. @@ -2149,14 +2085,6 @@ public final class Keys { */ public static final Key> TRADE_OFFERS = DummyObjectProvider.createExtendedFor(Key.class,"TRADE_OFFERS"); - /** - * Represents the {@link Key} for representing the {@link TreeType} - * of a {@link BlockState}. - * - * @see TreeData - */ - public static final Key> TREE_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"TREE_TYPE"); - /** * Represents the {@link Key} for whether an {@link ItemStack} is unbreakable. * @@ -2231,14 +2159,6 @@ public final class Keys { */ public static final Key> WALKING_SPEED = DummyObjectProvider.createExtendedFor(Key.class,"WALKING_SPEED"); - /** - * Represents the {@link Key} for the type of - * {@link BlockTypes#COBBLESTONE_WALL} blocks. - * - * @see WallData - */ - public static final Key> WALL_TYPE = DummyObjectProvider.createExtendedFor(Key.class,"WALL_TYPE"); - /** * Represents the {@link Key} for whether a thrown {@link EyeOfEnder} will * shatter. diff --git a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogBlockData.java b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogBlockData.java index 0bba97d1dd6..9254d51c5b5 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogBlockData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogBlockData.java @@ -26,21 +26,17 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.manipulator.DataManipulator; -import org.spongepowered.api.data.manipulator.mutable.DyeableData; import org.spongepowered.api.data.manipulator.mutable.RotationalData; import org.spongepowered.api.data.manipulator.mutable.WetData; import org.spongepowered.api.data.manipulator.mutable.block.AttachedData; import org.spongepowered.api.data.manipulator.mutable.block.AxisData; -import org.spongepowered.api.data.manipulator.mutable.block.BigMushroomData; -import org.spongepowered.api.data.manipulator.mutable.block.BrickData; +import org.spongepowered.api.data.manipulator.mutable.block.BigMushroomPoresData; +import org.spongepowered.api.data.manipulator.mutable.block.ChestAttachmentData; import org.spongepowered.api.data.manipulator.mutable.block.ConnectedDirectionData; import org.spongepowered.api.data.manipulator.mutable.block.DecayableData; import org.spongepowered.api.data.manipulator.mutable.block.DelayableData; import org.spongepowered.api.data.manipulator.mutable.block.DirectionalData; -import org.spongepowered.api.data.manipulator.mutable.block.DirtData; import org.spongepowered.api.data.manipulator.mutable.block.DisarmedData; -import org.spongepowered.api.data.manipulator.mutable.block.DisguisedBlockData; -import org.spongepowered.api.data.manipulator.mutable.block.DoublePlantData; import org.spongepowered.api.data.manipulator.mutable.block.DropData; import org.spongepowered.api.data.manipulator.mutable.block.ExtendedData; import org.spongepowered.api.data.manipulator.mutable.block.FilledData; @@ -49,42 +45,21 @@ import org.spongepowered.api.data.manipulator.mutable.block.HingeData; import org.spongepowered.api.data.manipulator.mutable.block.InWallData; import org.spongepowered.api.data.manipulator.mutable.block.LayeredData; +import org.spongepowered.api.data.manipulator.mutable.block.LitData; import org.spongepowered.api.data.manipulator.mutable.block.MoistureData; import org.spongepowered.api.data.manipulator.mutable.block.OccupiedData; import org.spongepowered.api.data.manipulator.mutable.block.OpenData; -import org.spongepowered.api.data.manipulator.mutable.block.PistonData; import org.spongepowered.api.data.manipulator.mutable.block.PortionData; import org.spongepowered.api.data.manipulator.mutable.block.PoweredData; -import org.spongepowered.api.data.manipulator.mutable.block.PrismarineData; -import org.spongepowered.api.data.manipulator.mutable.block.QuartzData; import org.spongepowered.api.data.manipulator.mutable.block.RailDirectionData; import org.spongepowered.api.data.manipulator.mutable.block.RedstonePoweredData; -import org.spongepowered.api.data.manipulator.mutable.block.SandData; -import org.spongepowered.api.data.manipulator.mutable.block.SandstoneData; -import org.spongepowered.api.data.manipulator.mutable.block.SeamlessData; -import org.spongepowered.api.data.manipulator.mutable.block.ShrubData; -import org.spongepowered.api.data.manipulator.mutable.block.SlabData; +import org.spongepowered.api.data.manipulator.mutable.block.SlabPortionData; import org.spongepowered.api.data.manipulator.mutable.block.SnowedData; import org.spongepowered.api.data.manipulator.mutable.block.StairShapeData; -import org.spongepowered.api.data.manipulator.mutable.block.StoneData; -import org.spongepowered.api.data.manipulator.mutable.block.TreeData; -import org.spongepowered.api.data.manipulator.mutable.block.WallData; import org.spongepowered.api.data.manipulator.mutable.block.WireAttachmentData; -import org.spongepowered.api.data.type.BrickType; -import org.spongepowered.api.data.type.DisguisedBlockType; -import org.spongepowered.api.data.type.DyeColor; -import org.spongepowered.api.data.type.PistonType; -import org.spongepowered.api.data.type.PrismarineType; -import org.spongepowered.api.data.type.QuartzType; import org.spongepowered.api.data.type.RailDirection; -import org.spongepowered.api.data.type.SandType; -import org.spongepowered.api.data.type.SandstoneType; -import org.spongepowered.api.data.type.ShrubType; -import org.spongepowered.api.data.type.SlabType; +import org.spongepowered.api.data.type.SlabPortion; import org.spongepowered.api.data.type.StairShape; -import org.spongepowered.api.data.type.StoneType; -import org.spongepowered.api.data.type.TreeType; -import org.spongepowered.api.data.type.WallType; import org.spongepowered.api.data.type.WireAttachmentType; import org.spongepowered.api.util.Axis; import org.spongepowered.api.util.Direction; @@ -108,22 +83,21 @@ public final class CatalogBlockData { * Represents data related to {@link BlockTypes#BROWN_MUSHROOM_BLOCK} and * {@link BlockTypes#RED_MUSHROOM_BLOCK}. */ - public static final Class BIG_MUSHROOM_DATA = BigMushroomData.class; + public static final Class BIG_MUSHROOM_DATA = BigMushroomPoresData.class; /** - * Represents the type of {@link BrickType} for a - * {@link BlockTypes#STONEBRICK}. + * Represents attachment data related to {@link BlockTypes#CHEST} and + * {@link BlockTypes#TRAPPED_CHEST}. */ - public static final Class BRICK_DATA = BrickData.class; + public static final Class CHEST_ATTACHMENT_DATA = ChestAttachmentData.class; /** * Signifies that a block is "connected" to a particular {@link Direction}. - * Usually applies to {@link BlockTypes#GLASS_PANE}, - * {@link BlockTypes#STAINED_GLASS_PANE}, and several others. + * Usually applies to {@link BlockTypes#GLASS_PANE}, stained glass panes, + * walls (e.g. {@link BlockTypes#COBBLESTONE_WALL}), etc. */ public static final Class CONNECTED_DIRECTION_DATA = ConnectedDirectionData.class; /** * Signifies that a block will "decay" or be removed after a certain time. - * Usually applicable to {@link BlockTypes#LEAVES} and - * {@link BlockTypes#LEAVES2}. + * Usually applicable to leaves, for example {@link BlockTypes#OAK_LEAVES}. */ public static final Class DECAYABLE_DATA = DecayableData.class; /** @@ -132,35 +106,15 @@ public final class CatalogBlockData { public static final Class DELAYABLE_DATA = DelayableData.class; /** * Signifies that a block has a {@link Direction}. Usually applies - * to "rotational" blocks, such as {@link BlockTypes#LOG} and - * {@link BlockTypes#LOG2} etc. + * to "rotational" blocks, such as {@link BlockTypes#DISPENSER}, shulker boxes + * (for example {@link BlockTypes#WHITE_SHULKER_BOX}), etc. */ public static final Class DIRECTIONAL_DATA = DirectionalData.class; - /** - * Signifies that a {@link BlockTypes#DIRT} of it's sub types. - */ - public static final Class DIRT_DATA = DirtData.class; /** * Signifies that a block is "disarmed". Usually applies to * {@link BlockTypes#TRIPWIRE_HOOK}s. */ public static final Class DISARMED_DATA = DisarmedData.class; - /** - * Represents the {@link DisguisedBlockType} of a block. Usually applies - * to {@link BlockTypes#MONSTER_EGG}. - */ - public static final Class DISGUISED_BLOCK_DATA = DisguisedBlockData.class; - /** - * Represents the type of a double plant. - */ - public static final Class DOUBLE_PLANT_DATA = DoublePlantData.class; - /** - * Signifies that a block is "dyed" a certain {@link DyeColor}. - * Usually applies to {@link BlockTypes#WOOL}, - * {@link BlockTypes#STAINED_GLASS}, - * {@link BlockTypes#STAINED_HARDENED_CLAY}, etc. - */ - public static final Class DYEABLE_DATA = DyeableData.class; /** * Signifies whether the block is "extended". Usually applicable to * {@link BlockTypes#PISTON}. @@ -183,19 +137,25 @@ public final class CatalogBlockData { public static final Class GROWTH_DATA = GrowthData.class; /** * Represents the "side" that a "hinge" is facing on a door. Usually - * applicable to {@link BlockTypes#TRAPDOOR} and other doors. + * applicable to doors and trapdoors. For example {@link BlockTypes#OAK_DOOR} + * or {@link BlockTypes#OAK_TRAPDOOR}. */ public static final Class HINGE_DATA = HingeData.class; /** * Signifies that the owner is "connected" to a wall. Usually applicable to - * {@link BlockTypes#FENCE_GATE}. + * fence gates, for example {@link BlockTypes#OAK_FENCE_GATE}. */ public static final Class IN_WALL_DATA = InWallData.class; /** * Represents the "layer" of an owner. Usually applicable to - * {@link BlockTypes#CAKE}, {@link BlockTypes#SNOW_LAYER}, etc. + * {@link BlockTypes#CAKE}, {@link BlockTypes#SNOW}, etc. */ public static final Class LAYERED_DATA = LayeredData.class; + /** + * Represents the {@link DataManipulator} for the state that something is "lit", + * for example a {@link BlockTypes#FURNACE} or {@link BlockTypes#REDSTONE_TORCH}. + */ + public static final Class LIT_DATA = LitData.class; /** * Represents the "moisture" level of a block. Usually applicable to * {@link BlockTypes#FARMLAND}. @@ -203,41 +163,27 @@ public final class CatalogBlockData { public static final Class MOISTURE_DATA = MoistureData.class; /** * Signifies that the owner will not drop anything. Usually applicable - * to {@link BlockTypes#SKULL}. + * skulls or heads, for example {@link BlockTypes#PLAYER_HEAD}. */ public static final Class NO_DROP_DATA = DropData.class; /** - * Signifies that a block is considered "occupied". Usually applicable to - * {@link BlockTypes#BED}. + * Signifies that the block is considered "occupied". Usually applicable to + * beds, for example {@link BlockTypes#WHITE_BED}. */ public static final Class OCCUPIED_DATA = OccupiedData.class; /** * Signifies that a block is "open". Usually applies to all doors. */ public static final Class OPEN_DATA = OpenData.class; - /** - * Represents the {@link PistonType} of a {@link BlockTypes#PISTON_HEAD}. - */ - public static final Class PISTON_DATA = PistonData.class; /** * Represents the "portion" of a block such as the top or bottom half of a - * door. Usually applies to all doors. + * door. Usually applies to all doors and double plants. */ public static final Class PORTION_DATA = PortionData.class; /** * Signifies that a block is "powered". */ public static final Class POWERED_DATA = PoweredData.class; - /** - * Represents the {@link PrismarineType} of a - * {@link BlockTypes#PRISMARINE}. - */ - public static final Class PRISMARINE_DATA = PrismarineData.class; - /** - * Represents the {@link QuartzType} of a - * {@link BlockTypes#QUARTZ_BLOCK}. - */ - public static final Class QUARTZ_DATA = QuartzData.class; /** * Represents the {@link RailDirection} of a {@link BlockTypes#RAIL} and * other types of rails. @@ -253,30 +199,10 @@ public final class CatalogBlockData { */ public static final Class ROTATIONAL_DATA = RotationalData.class; /** - * Represents the {@link SandType} of {@link BlockTypes#SAND}. + * Represents the {@link SlabPortion} of a slab block, + * for example {@link BlockTypes#STONE_SLAB}. */ - public static final Class SAND_DATA = SandData.class; - /** - * Represents the {@link SandstoneType} of a sandstone based block. Usually - * applicable to {@link BlockTypes#SANDSTONE} and - * {@link BlockTypes#RED_SANDSTONE}. - */ - public static final Class SANDSTONE_DATA = SandstoneData.class; - /** - * Signifies that a block is "seamless". Usually applicable to - * {@link BlockTypes#DOUBLE_STONE_SLAB}, - * {@link BlockTypes#DOUBLE_STONE_SLAB2}, - * and {@link BlockTypes#DOUBLE_WOODEN_SLAB}. - */ - public static final Class SEAMLESS_DATA = SeamlessData.class; - /** - * Represents the {@link ShrubType} of a {@link BlockTypes#TALLGRASS}. - */ - public static final Class SHRUB_DATA = ShrubData.class; - /** - * Represents the {@link SlabType} of slabs. - */ - public static final Class SLAB_DATA = SlabData.class; + public static final Class SLAB_PORTION_DATA = SlabPortionData.class; /** * Signifies that a block is considered to be "snowed. Usually applicable * to {@link BlockTypes#GRASS}, {@link BlockTypes#DIRT}, and @@ -287,27 +213,11 @@ public final class CatalogBlockData { * Represents the {@link StairShape} of a stair block. */ public static final Class STAIR_SHAPE_DATA = StairShapeData.class; - /** - * Represents the {@link StoneType} of a {@link BlockTypes#STONE}. - */ - public static final Class STONE_DATA = StoneData.class; - /** - * Represents the {@link TreeType} for various tree based blocks. Usually - * applicable to {@link BlockTypes#SAPLING}, {@link BlockTypes#LEAVES}, - * and {@link BlockTypes#LOG}. - */ - public static final Class TREE_DATA = TreeData.class; - /** - * Represents the {@link WallType} of a - * {@link BlockTypes#COBBLESTONE_WALL}. - */ - public static final Class WALL_DATA = WallData.class; /** * Signifies that a block is considered "wet". Usually applicable to * {@link BlockTypes#SPONGE}. */ public static final Class WET_DATA = WetData.class; - /** * Represents the {@link WireAttachmentType}s for the four cardinal directions of a * piece of {@link BlockTypes#REDSTONE_WIRE}. diff --git a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogEntityData.java b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogEntityData.java index d1107ccac3b..a77616596e8 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogEntityData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogEntityData.java @@ -164,7 +164,7 @@ public final class CatalogEntityData { public static final Class DOMINANT_HAND_DATA = DominantHandData.class; /** * Signifies that the entity can be dyed a specific {@link DyeColor}. - * Usually applies to {@link Sheep}. + * Usually applies to {@link Sheep} and {@link Wolf}. */ public static final Class DYEABLE_DATA = DyeableData.class; /** diff --git a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogItemData.java b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogItemData.java index 85ab7c3172a..78df7ec3530 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogItemData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogItemData.java @@ -36,13 +36,9 @@ import org.spongepowered.api.data.manipulator.mutable.TargetedLocationData; import org.spongepowered.api.data.manipulator.mutable.item.BlockItemData; import org.spongepowered.api.data.manipulator.mutable.item.BreakableData; -import org.spongepowered.api.data.manipulator.mutable.item.CoalData; -import org.spongepowered.api.data.manipulator.mutable.item.CookedFishData; import org.spongepowered.api.data.manipulator.mutable.item.DurabilityData; import org.spongepowered.api.data.manipulator.mutable.item.EnchantmentData; -import org.spongepowered.api.data.manipulator.mutable.item.FishData; import org.spongepowered.api.data.manipulator.mutable.item.GenerationData; -import org.spongepowered.api.data.manipulator.mutable.item.GoldenAppleData; import org.spongepowered.api.data.manipulator.mutable.item.InventoryItemData; import org.spongepowered.api.data.manipulator.mutable.item.LoreData; import org.spongepowered.api.data.manipulator.mutable.item.MapItemData; @@ -50,11 +46,7 @@ import org.spongepowered.api.data.manipulator.mutable.item.PlaceableData; import org.spongepowered.api.data.manipulator.mutable.item.SpawnableData; import org.spongepowered.api.data.manipulator.mutable.item.StoredEnchantmentData; -import org.spongepowered.api.data.type.CoalType; -import org.spongepowered.api.data.type.CookedFish; import org.spongepowered.api.data.type.DyeColor; -import org.spongepowered.api.data.type.Fish; -import org.spongepowered.api.data.type.GoldenApple; import org.spongepowered.api.effect.potion.PotionEffect; import org.spongepowered.api.entity.EntityType; import org.spongepowered.api.item.FireworkEffect; @@ -85,21 +77,12 @@ public final class CatalogItemData { * applicable to {@link ItemTypes#WRITTEN_BOOK}. */ public static final Class CLONEABLE_DATA = GenerationData.class; - /** - * Represents the {@link CoalType} of an {@link ItemTypes#COAL}. - */ - public static final Class COAL_ITEM_DATA = CoalData.class; /** * Signifies that an item is rendered by a specific {@link Color}. * Usually applicable to {@link ItemTypes#LEATHER_BOOTS} and other leather * armors. */ public static final Class COLORED_ITEM_DATA = ColoredData.class; - /** - * Represents the {@link CookedFish} type of a - * {@link ItemTypes#COOKED_FISH}. - */ - public static final Class COOKED_FISH_ITEM_DATA = CookedFishData.class; /** * Signifies that an item has a custom name. */ @@ -118,23 +101,14 @@ public final class CatalogItemData { */ public static final Class ENCHANTMENT_DATA = EnchantmentData.class; /** - * Represents the {@link FireworkEffect}s of {@link ItemTypes#FIREWORKS} - * or a {@link ItemTypes#FIREWORK_CHARGE}. + * Represents the {@link FireworkEffect}s of {@link ItemTypes#FIREWORK_ROCKET} + * or a {@link ItemTypes#FIREWORK_STAR}. */ public static final Class FIREWORK_EFFECT_DATA = FireworkEffectData.class; /** - * Represents the flight time of {@link ItemTypes#FIREWORKS}. + * Represents the flight time of {@link ItemTypes#FIREWORK_ROCKET}. */ public static final Class FIREWORK_ROCKET_DATA = FireworkRocketData.class; - /** - * Represents the {@link Fish} type of a {@link ItemTypes#FISH}. - */ - public static final Class FISH_DATA = FishData.class; - /** - * Represents the {@link GoldenApple} type of a - * {@link ItemTypes#GOLDEN_APPLE}. - */ - public static final Class GOLDEN_APPLE_ITEM_DATA = GoldenAppleData.class; /** * Signifies that an item has an {@link Inventory} attached to it. Usually * applicable to {@link ItemTypes#CHEST} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogTileEntityData.java b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogTileEntityData.java index 17f9257fd78..71f8fa9a311 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogTileEntityData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/catalog/CatalogTileEntityData.java @@ -24,15 +24,14 @@ */ package org.spongepowered.api.data.manipulator.catalog; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.block.tileentity.Banner; import org.spongepowered.api.block.tileentity.CommandBlock; import org.spongepowered.api.block.tileentity.Comparator; -import org.spongepowered.api.block.tileentity.FlowerPot; import org.spongepowered.api.block.tileentity.Jukebox; import org.spongepowered.api.block.tileentity.MobSpawner; -import org.spongepowered.api.block.tileentity.Note; import org.spongepowered.api.block.tileentity.Sign; -import org.spongepowered.api.block.tileentity.Skull; +import org.spongepowered.api.block.tileentity.PlayerHead; import org.spongepowered.api.block.tileentity.TileEntity; import org.spongepowered.api.block.tileentity.carrier.Beacon; import org.spongepowered.api.block.tileentity.carrier.BrewingStand; @@ -52,7 +51,7 @@ import org.spongepowered.api.data.manipulator.mutable.tileentity.CooldownData; import org.spongepowered.api.data.manipulator.mutable.tileentity.FurnaceData; import org.spongepowered.api.data.manipulator.mutable.tileentity.LockableData; -import org.spongepowered.api.data.manipulator.mutable.tileentity.NoteData; +import org.spongepowered.api.data.manipulator.mutable.block.NoteData; import org.spongepowered.api.data.manipulator.mutable.tileentity.SignData; import org.spongepowered.api.data.meta.PatternLayer; import org.spongepowered.api.item.inventory.ItemStack; @@ -103,17 +102,17 @@ public final class CatalogTileEntityData { */ public static final Class LOCKABLE_DATA = LockableData.class; /** - * Represents the {@link Note} data. + * Represents the {@link BlockTypes#NOTE_BLOCK} data. */ public static final Class NOTE_DATA = NoteData.class; /** * Represents data pertaining to a {@link GameProfile} for a tile entity. - * Usually applicable to {@link Skull}s. + * Usually applicable to {@link PlayerHead}s. */ public static final Class REPRESENTED_PLAYER_DATA = RepresentedPlayerData.class; /** * Represents a {@link TileEntity} that acts on an {@link ItemStack}. - * Usually applicable to {@link Jukebox}es and {@link FlowerPot}s. + * Usually applicable to {@link Jukebox}es. */ public static final Class JUKEBOX_DATA = RepresentedItemData.class; /** @@ -125,7 +124,6 @@ public final class CatalogTileEntityData { */ public static final Class MOB_SPAWNER_DATA = MobSpawnerData.class; - private CatalogTileEntityData() { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableSkullData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableInvertibleData.java similarity index 66% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableSkullData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableInvertibleData.java index 1971bfdf378..3eaf9f901b7 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableSkullData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableInvertibleData.java @@ -24,17 +24,22 @@ */ package org.spongepowered.api.data.manipulator.immutable; -import org.spongepowered.api.block.tileentity.Skull; -import org.spongepowered.api.data.manipulator.mutable.SkullData; -import org.spongepowered.api.data.type.SkullType; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; +import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; +import org.spongepowered.api.data.manipulator.mutable.InvertibleData; +import org.spongepowered.api.data.value.immutable.ImmutableValue; /** - * An {@link ImmutableVariantData} specializing in the {@link SkullType} - * represented by a {@link Skull} or {@link ItemStack} of the type - * {@link ItemTypes#SKULL}. + * Represents an {@link ImmutableDataManipulator} for the "inverted" state of + * an {@link BlockTypes#DAYLIGHT_DETECTOR}. */ -public interface ImmutableSkullData extends ImmutableVariantData { +public interface ImmutableInvertibleData extends ImmutableDataManipulator { + + /** + * Gets the {@link ImmutableValue} for the "inverted" state. + * + * @return The value for the "inverted" state + */ + ImmutableValue inverted(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableRepresentedPlayerData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableRepresentedPlayerData.java index d2208dde3aa..9543fcccf93 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableRepresentedPlayerData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/ImmutableRepresentedPlayerData.java @@ -24,7 +24,7 @@ */ package org.spongepowered.api.data.manipulator.immutable; -import org.spongepowered.api.block.tileentity.Skull; +import org.spongepowered.api.block.tileentity.PlayerHead; import org.spongepowered.api.block.tileentity.TileEntity; import org.spongepowered.api.data.DataHolder; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; @@ -35,7 +35,7 @@ /** * An {@link ImmutableDataManipulator} handling the {@link GameProfile} - * represented by this {@link DataHolder}. Applicable to a {@link Skull} + * represented by this {@link DataHolder}. Applicable to a {@link PlayerHead} * {@link TileEntity} or {@link ItemStack}. */ public interface ImmutableRepresentedPlayerData extends ImmutableDataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableAxisData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableAxisData.java index e95237c4665..342e10cb675 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableAxisData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableAxisData.java @@ -25,22 +25,15 @@ package org.spongepowered.api.data.manipulator.immutable.block; import org.spongepowered.api.block.BlockState; -import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; import org.spongepowered.api.data.manipulator.mutable.block.AxisData; -import org.spongepowered.api.data.type.LogAxes; -import org.spongepowered.api.data.type.LogAxis; import org.spongepowered.api.data.value.immutable.ImmutableValue; import org.spongepowered.api.util.Axis; /** * An {@link ImmutableDataManipulator} containing the {@link ImmutableValue} * for the {@link Axis} a {@link BlockState} may have. - * - *

Note that {@link BlockTypes#LOG} and {@link BlockTypes#LOG2} do NOT - * utilize {@link Axis} but instead use {@link LogAxis} due to their nature - * of having {@link LogAxes#NONE}.

*/ public interface ImmutableAxisData extends ImmutableVariantData { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomPoresData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomPoresData.java new file mode 100644 index 00000000000..1702cc8232d --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomPoresData.java @@ -0,0 +1,106 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.manipulator.immutable.block; + +import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.key.Keys; +import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; +import org.spongepowered.api.data.manipulator.mutable.block.BigMushroomPoresData; +import org.spongepowered.api.data.value.immutable.ImmutableSetValue; +import org.spongepowered.api.data.value.immutable.ImmutableValue; +import org.spongepowered.api.util.Direction; + +/** + * Represents data related to {@link BlockTypes#BROWN_MUSHROOM_BLOCK} and + * {@link BlockTypes#RED_MUSHROOM_BLOCK}. + * + * @see Keys#BIG_MUSHROOM_PORES + */ +public interface ImmutableBigMushroomPoresData extends ImmutableDataManipulator { + + /** + * Gets the {@link ImmutableSetValue} for the currently {@link Direction} sides + * with pores. + * + * @return The immutable set value for the sides with pores + * @see Keys#BIG_MUSHROOM_PORES + */ + ImmutableSetValue sides(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#NORTH} + * side has pores. + * + * @return The value for the northern side + * @see Keys#BIG_MUSHROOM_PORES_NORTH + */ + ImmutableValue north(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#SOUTH} + * side has pores. + * + * @return The value for the southern side + * @see Keys#BIG_MUSHROOM_PORES_SOUTH + */ + ImmutableValue south(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#EAST} + * side has pores. + * + * @return The value for the eastern side + * @see Keys#BIG_MUSHROOM_PORES_EAST + */ + ImmutableValue east(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#WEST} + * side has pores. + * + * @return The value for the western side + * @see Keys#BIG_MUSHROOM_PORES_WEST + */ + ImmutableValue west(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#UP} (top) + * side has pores. + * + * @return The value for the up/top side + * @see Keys#BIG_MUSHROOM_PORES_UP + */ + ImmutableValue up(); + + /** + * Gets the {@link ImmutableValue} for whether the {@link Direction#DOWN} (bottom) + * side has pores. + * + * @return The value for the down/bottom side + * @see Keys#BIG_MUSHROOM_PORES_DOWN + */ + ImmutableValue down(); + +} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableChestAttachmentData.java similarity index 81% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableChestAttachmentData.java index 88a925058f3..d2124c5cf49 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBigMushroomData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableChestAttachmentData.java @@ -27,13 +27,13 @@ import org.spongepowered.api.block.BlockState; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.BigMushroomData; -import org.spongepowered.api.data.type.BigMushroomType; +import org.spongepowered.api.data.manipulator.mutable.block.ChestAttachmentData; +import org.spongepowered.api.data.type.ChestAttachmentType; /** * An {@link ImmutableDataManipulator} handling the value of the - * {@link BigMushroomType} of a {@link BlockState} at a location. + * {@link ChestAttachmentType} of a {@link BlockState} at a location. */ -public interface ImmutableBigMushroomData extends ImmutableVariantData { +public interface ImmutableChestAttachmentData extends ImmutableVariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDecayableData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDecayableData.java index bd4c83e7da4..ecc4e11dd3a 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDecayableData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDecayableData.java @@ -26,22 +26,35 @@ import org.spongepowered.api.block.BlockState; import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; import org.spongepowered.api.data.manipulator.mutable.block.DecayableData; +import org.spongepowered.api.data.value.immutable.ImmutableBoundedValue; import org.spongepowered.api.data.value.immutable.ImmutableValue; +import org.spongepowered.api.data.value.mutable.Value; /** * An {@link ImmutableDataManipulator} for the "decayable" state of a - * {@link BlockState}. Usually applicable for {@link BlockTypes#LEAVES}. + * {@link BlockState}. Usually applicable for {@link BlockTypes#OAK_LEAVES}. */ public interface ImmutableDecayableData extends ImmutableDataManipulator { /** - * Gets the {@link ImmutableValue} for whether the "decayable" state is - * {@code true} or {@code false}. + * Gets the {@link Value} for the distance at which + * the {@link BlockState} can start to decay. * - * @return The immutable value for the "decayable" state + * @return The immutable value for the decay distance + * @see Keys#DECAY_DISTANCE */ - ImmutableValue decayable(); + ImmutableBoundedValue distance(); + + /** + * Gets the {@link Value} for whether the {@link BlockState} state is + * persistent and will be prevented from decaying. + * + * @return The immutable value for the persistent state + * @see Keys#PERSISTENT + */ + ImmutableValue persistent(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDirtData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDirtData.java deleted file mode 100644 index acb7acdeb6f..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDirtData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.DirtData; -import org.spongepowered.api.data.type.DirtType; - -/** - * An {@link ImmutableVariantData} for the {@link DirtType}. Usually applicable - * to {@link BlockTypes#DIRT}. - */ -public interface ImmutableDirtData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDisguisedBlockData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDisguisedBlockData.java deleted file mode 100644 index 795e0112349..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDisguisedBlockData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.DisguisedBlockData; -import org.spongepowered.api.data.type.DisguisedBlockType; - -/** - * An {@link ImmutableVariantData} for a {@link DisguisedBlockType}. Usually - * applicable for {@link BlockTypes#MONSTER_EGG}. - */ -public interface ImmutableDisguisedBlockData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDoublePlantData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDoublePlantData.java deleted file mode 100644 index 39962be169d..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableDoublePlantData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.DoublePlantData; -import org.spongepowered.api.data.type.DoublePlantType; - -/** - * An {@link ImmutableVariantData} for {@link DoublePlantType}. Usually - * applicable to {@link BlockTypes#DOUBLE_PLANT}. - */ -public interface ImmutableDoublePlantData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePrismarineData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableInstrumentData.java similarity index 76% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePrismarineData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableInstrumentData.java index 25ab6c5a1b6..806b20ea742 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePrismarineData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableInstrumentData.java @@ -25,14 +25,17 @@ package org.spongepowered.api.data.manipulator.immutable.block; import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.PrismarineData; -import org.spongepowered.api.data.type.PrismarineType; +import org.spongepowered.api.data.manipulator.mutable.block.InstrumentData; +import org.spongepowered.api.data.type.InstrumentType; /** - * An {@link ImmutableVariantData} for the {@link PrismarineType}. Usually - * applicable to {@link BlockTypes#PRISMARINE}. + * An {@link ImmutableVariantData} for the {@link InstrumentType} + * of a {@link BlockTypes#NOTE_BLOCK}. + * + * @see Keys#INSTRUMENT */ -public interface ImmutablePrismarineData extends ImmutableVariantData { +public interface ImmutableInstrumentData extends ImmutableVariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSeamlessData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLitData.java similarity index 71% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSeamlessData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLitData.java index 11013664b9b..d182cd65f69 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSeamlessData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLitData.java @@ -26,22 +26,20 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; -import org.spongepowered.api.data.manipulator.mutable.block.SeamlessData; +import org.spongepowered.api.data.manipulator.mutable.block.LitData; import org.spongepowered.api.data.value.immutable.ImmutableValue; /** - * An {@link ImmutableDataManipulator} for the "seamless" state. This is - * normally a simple visual change for the applicable block types of - * {@link BlockTypes#DOUBLE_STONE_SLAB}, {@link BlockTypes#DOUBLE_STONE_SLAB2}, - * and {@link BlockTypes#DOUBLE_WOODEN_SLAB}. + * Represents the {@link ImmutableDataManipulator} for the state that something is "lit", + * for example a {@link BlockTypes#FURNACE} or {@link BlockTypes#REDSTONE_TORCH}. */ -public interface ImmutableSeamlessData extends ImmutableDataManipulator { +public interface ImmutableLitData extends ImmutableDataManipulator { /** - * Gets the {@link ImmutableValue} for the "seamless" state. + * Gets the {@link ImmutableValue} for the lit state. * - * @return The immutable value for the "seamless" state + * @return The immutable value for the lit state */ - ImmutableValue seamless(); + ImmutableValue lit(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLogAxisData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLogAxisData.java deleted file mode 100644 index 002f489b017..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableLogAxisData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.LogAxisData; -import org.spongepowered.api.data.type.LogAxes; -import org.spongepowered.api.data.type.LogAxis; - -/** - * An {@link ImmutableVariantData} for the {@link LogAxis}. Usually applies to - * all types of {@link BlockTypes#LOG}. This is fundamentally different from - * {@link ImmutableAxisData} due to the fact that a log can have a - * {@link LogAxes#NONE}. - */ -public interface ImmutableLogAxisData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/tileentity/ImmutableNoteData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableNoteData.java similarity index 89% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/tileentity/ImmutableNoteData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableNoteData.java index b1ad520f429..20803419261 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/tileentity/ImmutableNoteData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableNoteData.java @@ -22,18 +22,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.data.manipulator.immutable.tileentity; +package org.spongepowered.api.data.manipulator.immutable.block; -import org.spongepowered.api.block.tileentity.Note; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; -import org.spongepowered.api.data.manipulator.mutable.tileentity.NoteData; +import org.spongepowered.api.data.manipulator.mutable.block.NoteData; import org.spongepowered.api.data.type.NotePitch; import org.spongepowered.api.data.value.immutable.ImmutableValue; /** - * An {@link ImmutableDataManipulator} handling the {@link NotePitch} for a - * {@link Note}. + * An {@link ImmutableDataManipulator} handling the {@link NotePitch} for a {@link BlockTypes#NOTE_BLOCK}. */ public interface ImmutableNoteData extends ImmutableDataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableOccupiedData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableOccupiedData.java index 8c096d953eb..cc2ef97bd84 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableOccupiedData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableOccupiedData.java @@ -31,7 +31,7 @@ /** * An {@link ImmutableDataManipulator} for the "occupied" state. Usually - * applicable to {@link BlockTypes#BED}. + * applicable to beds, for example {@link BlockTypes#WHITE_BED}. */ public interface ImmutableOccupiedData extends ImmutableDataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePlantData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePlantData.java deleted file mode 100644 index e6b26d8032a..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePlantData.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.PlantData; -import org.spongepowered.api.data.type.PlantType; - -/** - * An {@link ImmutableVariantData} for the {@link PlantType} state. Usually - * applicable to {@link BlockTypes#RED_FLOWER} and - * {@link BlockTypes#YELLOW_FLOWER}. - */ -public interface ImmutablePlantData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableQuartzData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableQuartzData.java deleted file mode 100644 index ca683eb0171..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableQuartzData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.QuartzData; -import org.spongepowered.api.data.type.QuartzType; - -/** - * An {@link ImmutableVariantData} for the {@link QuartzType}. Usually - * applicable to {@link BlockTypes#QUARTZ_BLOCK}. - */ -public interface ImmutableQuartzData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandData.java deleted file mode 100644 index a34bdb760ab..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.SandData; -import org.spongepowered.api.data.type.SandType; - -/** - * An {@link ImmutableVariantData} for the {@link SandType}. Usually applicable - * to {@link BlockTypes#SAND}. - */ -public interface ImmutableSandData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandstoneData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandstoneData.java deleted file mode 100644 index 6d777e2e947..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSandstoneData.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.SandstoneData; -import org.spongepowered.api.data.type.SandstoneType; - -/** - * An {@link ImmutableVariantData} for the {@link SandstoneType}. Usually - * applicable to {@link BlockTypes#SANDSTONE} and - * {@link BlockTypes#RED_SANDSTONE}. - */ -public interface ImmutableSandstoneData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableShrubData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableShrubData.java deleted file mode 100644 index a8e0d23e686..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableShrubData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.ShrubData; -import org.spongepowered.api.data.type.ShrubType; - -/** - * An {@link ImmutableVariantData} for the {@link ShrubType}. Usually - * applicable to {@link BlockTypes#TALLGRASS}. - */ -public interface ImmutableShrubData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabData.java deleted file mode 100644 index 8c98b63e96d..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.SlabData; -import org.spongepowered.api.data.type.SlabType; - -/** - * An {@link ImmutableVariantData} for the {@link SlabType}. Usually applicable - * to {@link BlockTypes#STONE_SLAB} and {@link BlockTypes#STONE_SLAB2}, etc. - */ -public interface ImmutableSlabData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBrickData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabPortionData.java similarity index 83% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBrickData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabPortionData.java index 2f0564ff3f3..bb40891ec45 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableBrickData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSlabPortionData.java @@ -27,13 +27,13 @@ import org.spongepowered.api.block.BlockState; import org.spongepowered.api.data.manipulator.ImmutableDataManipulator; import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.BrickData; -import org.spongepowered.api.data.type.BrickType; +import org.spongepowered.api.data.manipulator.mutable.block.SlabPortionData; +import org.spongepowered.api.data.type.SlabPortion; /** * An {@link ImmutableDataManipulator} handling the value of the - * {@link BrickType} of a {@link BlockState} at a location. + * {@link SlabPortion} of a {@link BlockState} at a location. */ -public interface ImmutableBrickData extends ImmutableVariantData { +public interface ImmutableSlabPortionData extends ImmutableVariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableStoneData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableStoneData.java deleted file mode 100644 index 97845fff502..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableStoneData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.StoneData; -import org.spongepowered.api.data.type.StoneType; - -/** - * An {@link ImmutableVariantData} for the {@link StoneType}. Usually - * applicable to {@link BlockTypes#STONE}. - */ -public interface ImmutableStoneData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePistonData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSurfaceAttachmentData.java similarity index 75% rename from src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePistonData.java rename to src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSurfaceAttachmentData.java index 0d7b2b8a989..c7a0c495995 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutablePistonData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableSurfaceAttachmentData.java @@ -24,15 +24,17 @@ */ package org.spongepowered.api.data.manipulator.immutable.block; -import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.PistonData; -import org.spongepowered.api.data.type.PistonType; +import org.spongepowered.api.data.manipulator.mutable.block.SurfaceAttachmentData; +import org.spongepowered.api.data.type.Surface; /** - * An {@link ImmutableVariantData} for the {@link PistonType}. Usually - * applicable to {@link BlockTypes#PISTON_HEAD}. + * An {@link ImmutableVariantData} for the attachment {@link Surface} + * of levers and buttons. + * + * @see Keys#ATTACHMENT_SURFACE */ -public interface ImmutablePistonData extends ImmutableVariantData { +public interface ImmutableSurfaceAttachmentData extends ImmutableVariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableTreeData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableTreeData.java deleted file mode 100644 index 0c7d369e0f5..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableTreeData.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.TreeData; -import org.spongepowered.api.data.type.TreeType; - -/** - * An {@link ImmutableVariantData} for the {@link TreeType}. The main use for - * this type is for a visual difference in the types of tree related blocks. - * Usually applicable to {@link BlockTypes#SAPLING}, {@link BlockTypes#PLANKS}, - * {@link BlockTypes#LOG}, etc. - */ -public interface ImmutableTreeData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableWallData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableWallData.java deleted file mode 100644 index dad22bde810..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/block/ImmutableWallData.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.block.WallData; -import org.spongepowered.api.data.type.WallType; - -/** - * An {@link ImmutableVariantData} for the {@link WallType}. Usually applicable - * to {@link BlockTypes#COBBLESTONE_WALL}. - */ -public interface ImmutableWallData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCoalData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCoalData.java deleted file mode 100644 index 5abdce659e4..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCoalData.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.item; - -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.item.CoalData; -import org.spongepowered.api.data.type.CoalType; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link ImmutableVariantData} handling the {@link CoalType} of an - * {@link ItemStack} of the {@link ItemTypes#COAL}. - */ -public interface ImmutableCoalData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCookedFishData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCookedFishData.java deleted file mode 100644 index 00422e26815..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableCookedFishData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.item; - -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.item.CookedFishData; -import org.spongepowered.api.data.type.CookedFish; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link ImmutableVariantData} handling the {@link CookedFish} of an - * {@link ItemStack} of the {@link ItemTypes#COOKED_FISH}. - * - *

Since different types of fish have different properties, it is - * recommended to further check the specific item properties associated with - * the fish type from the item stack after changing this data.

- */ -public interface ImmutableCookedFishData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableFishData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableFishData.java deleted file mode 100644 index e1972c4a61c..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableFishData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.item; - -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.item.FishData; -import org.spongepowered.api.data.type.Fish; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link ImmutableVariantData} handling the {@link Fish} of an - * {@link ItemStack} of the {@link ItemTypes#FISH}. - * - *

Since different types of fish have different properties, it is - * recommended to further check the specific item properties associated with - * the fish type from the item stack after changing this data.

- */ -public interface ImmutableFishData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableGoldenAppleData.java b/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableGoldenAppleData.java deleted file mode 100644 index 129bea793cf..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/immutable/item/ImmutableGoldenAppleData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.immutable.item; - -import org.spongepowered.api.data.manipulator.immutable.ImmutableVariantData; -import org.spongepowered.api.data.manipulator.mutable.item.GoldenAppleData; -import org.spongepowered.api.data.type.GoldenApple; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link ImmutableVariantData} handling the {@link GoldenApple} of an - * {@link ItemStack} of the {@link ItemTypes#GOLDEN_APPLE}. - * - *

Since different types of golden apples have different properties, it is - * recommended to further check the specific item properties associated with - * the fish type from the item stack after changing this data.

- */ -public interface ImmutableGoldenAppleData extends ImmutableVariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/DyeableData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/DyeableData.java index 569aa4f267f..3d90646586c 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/DyeableData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/DyeableData.java @@ -24,7 +24,6 @@ */ package org.spongepowered.api.data.manipulator.mutable; -import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.DataHolder; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.immutable.ImmutableDyeableData; @@ -34,9 +33,7 @@ /** * An {@link VariantData} handling the {@link DyeColor} for a - * {@link DataHolder}, including {@link BlockTypes#WOOL}, {@link BlockTypes#STAINED_HARDENED_CLAY}, - * {@link BlockTypes#CARPET}, {@link BlockTypes#STAINED_GLASS}, {@link BlockTypes#STAINED_GLASS_PANE}, - * {@link Sheep}, and {@link Wolf}. + * {@link DataHolder}, including {@link Sheep} and {@link Wolf}. * * @see Keys#DYE_COLOR */ diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/SkullData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/InvertibleData.java similarity index 71% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/SkullData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/InvertibleData.java index 283b8b7c8d1..f0578ad0c19 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/SkullData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/InvertibleData.java @@ -24,20 +24,24 @@ */ package org.spongepowered.api.data.manipulator.mutable; -import org.spongepowered.api.block.tileentity.Skull; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.ImmutableSkullData; -import org.spongepowered.api.data.type.SkullType; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; +import org.spongepowered.api.data.manipulator.DataManipulator; +import org.spongepowered.api.data.manipulator.immutable.ImmutableInvertibleData; +import org.spongepowered.api.data.value.mutable.Value; /** - * An {@link VariantData} specializing in the {@link SkullType} - * represented by a {@link Skull} or {@link ItemStack} of the type - * {@link ItemTypes#SKULL}. - * - * @see Keys#SKULL_TYPE + * Represents an {@link DataManipulator} for the "inverted" state of + * an {@link BlockTypes#DAYLIGHT_DETECTOR}. */ -public interface SkullData extends VariantData { +public interface InvertibleData extends DataManipulator { + + /** + * Gets the {@link Value} for the "inverted" state. + * + * @return The value for the "inverted" state + * @see Keys#INVERTED + */ + Value inverted(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/RepresentedPlayerData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/RepresentedPlayerData.java index df5ee691fcd..fca04fd49c4 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/RepresentedPlayerData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/RepresentedPlayerData.java @@ -24,7 +24,7 @@ */ package org.spongepowered.api.data.manipulator.mutable; -import org.spongepowered.api.block.tileentity.Skull; +import org.spongepowered.api.block.tileentity.PlayerHead; import org.spongepowered.api.block.tileentity.TileEntity; import org.spongepowered.api.data.DataHolder; import org.spongepowered.api.data.key.Keys; @@ -36,7 +36,7 @@ /** * An {@link DataManipulator} handling the {@link GameProfile} - * represented by this {@link DataHolder}. Applicable to a {@link Skull} + * represented by this {@link DataHolder}. Applicable to a {@link PlayerHead} * {@link TileEntity} or {@link ItemStack}. */ public interface RepresentedPlayerData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/AxisData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/AxisData.java index 0b044cfe43a..fc0b45920a0 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/AxisData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/AxisData.java @@ -28,17 +28,11 @@ import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.immutable.block.ImmutableAxisData; import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.LogAxes; -import org.spongepowered.api.data.type.LogAxis; import org.spongepowered.api.util.Axis; /** * Represents the {@link Axis} aligned data for various "rotational" blocks - * such as {@link BlockTypes#LOG}, {@link BlockTypes#QUARTZ_BLOCK}, etc. - * - *

Note that {@link BlockTypes#LOG} and {@link BlockTypes#LOG2} do NOT - * utilize {@link Axis} but instead use {@link LogAxis} due to their nature - * of having {@link LogAxes#NONE}.

+ * such as {@link BlockTypes#OAK_LOG}, {@link BlockTypes#QUARTZ_PILLAR}, etc. * * @see Keys#AXIS */ diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomPoresData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomPoresData.java new file mode 100644 index 00000000000..d0ed0540c5e --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomPoresData.java @@ -0,0 +1,105 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.manipulator.mutable.block; + +import org.spongepowered.api.block.BlockTypes; +import org.spongepowered.api.data.key.Keys; +import org.spongepowered.api.data.manipulator.DataManipulator; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableBigMushroomPoresData; +import org.spongepowered.api.data.value.mutable.SetValue; +import org.spongepowered.api.data.value.mutable.Value; +import org.spongepowered.api.util.Direction; + +/** + * Represents data related to {@link BlockTypes#BROWN_MUSHROOM_BLOCK} and + * {@link BlockTypes#RED_MUSHROOM_BLOCK}. + * + * @see Keys#BIG_MUSHROOM_PORES + */ +public interface BigMushroomPoresData extends DataManipulator { + + /** + * Gets the {@link SetValue} for the currently {@link Direction} sides + * with pores. + * + * @return The immutable set value for the sides with pores + * @see Keys#BIG_MUSHROOM_PORES + */ + SetValue sides(); + + /** + * Gets the {@link Value} for whether the {@link Direction#NORTH} + * side has pores. + * + * @return The value for the northern side + * @see Keys#BIG_MUSHROOM_PORES_NORTH + */ + Value north(); + + /** + * Gets the {@link Value} for whether the {@link Direction#SOUTH} + * side has pores. + * + * @return The value for the southern side + * @see Keys#BIG_MUSHROOM_PORES_SOUTH + */ + Value south(); + + /** + * Gets the {@link Value} for whether the {@link Direction#EAST} + * side has pores. + * + * @return The value for the eastern side + * @see Keys#BIG_MUSHROOM_PORES_EAST + */ + Value east(); + + /** + * Gets the {@link Value} for whether the {@link Direction#WEST} + * side has pores. + * + * @return The value for the western side + * @see Keys#BIG_MUSHROOM_PORES_WEST + */ + Value west(); + + /** + * Gets the {@link Value} for whether the {@link Direction#UP} (top) + * side has pores. + * + * @return The value for the up/top side + * @see Keys#BIG_MUSHROOM_PORES_UP + */ + Value up(); + + /** + * Gets the {@link Value} for whether the {@link Direction#DOWN} (bottom) + * side has pores. + * + * @return The value for the down/bottom side + * @see Keys#BIG_MUSHROOM_PORES_DOWN + */ + Value down(); +} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ChestAttachmentData.java similarity index 81% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ChestAttachmentData.java index 09ab7a42968..4766f7dd555 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BigMushroomData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ChestAttachmentData.java @@ -26,16 +26,16 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableBigMushroomData; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableChestAttachmentData; import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.BigMushroomType; +import org.spongepowered.api.data.type.ChestAttachmentType; /** - * Represents data related to {@link BlockTypes#BROWN_MUSHROOM_BLOCK} and - * {@link BlockTypes#RED_MUSHROOM_BLOCK}. + * Represents attachment data related to {@link BlockTypes#CHEST} and + * {@link BlockTypes#TRAPPED_CHEST}. * - * @see Keys#BIG_MUSHROOM_TYPE + * @see Keys#CHEST_ATTACHMENT */ -public interface BigMushroomData extends VariantData { +public interface ChestAttachmentData extends VariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ConnectedDirectionData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ConnectedDirectionData.java index facfcad38fc..b2fcff62b11 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ConnectedDirectionData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ConnectedDirectionData.java @@ -35,7 +35,7 @@ /** * Represents the "connected" {@link Direction}s that a block may have. * Examples may include {@link BlockTypes#GLASS_PANE}, - * {@link BlockTypes#IRON_BARS}, etc. + * {@link BlockTypes#IRON_BARS}, {@link BlockTypes#COBBLESTONE_WALL}, etc. */ public interface ConnectedDirectionData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DecayableData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DecayableData.java index dbeb3ac84bd..f117b481c85 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DecayableData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DecayableData.java @@ -24,25 +24,36 @@ */ package org.spongepowered.api.data.manipulator.mutable.block; +import org.spongepowered.api.block.BlockState; import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.DataManipulator; import org.spongepowered.api.data.manipulator.immutable.block.ImmutableDecayableData; +import org.spongepowered.api.data.value.mutable.MutableBoundedValue; import org.spongepowered.api.data.value.mutable.Value; /** * Signifies that a block can "decay" under various circumstances. - * Usually applicable to {@link BlockTypes#LEAVES}. + * Usually applicable to leaves, for example {@link BlockTypes#OAK_LEAVES}. */ public interface DecayableData extends DataManipulator { /** - * Gets the {@link Value} for whether the "decayable" state is - * {@code true} or {@code false}. + * Gets the {@link Value} for the distance at which + * the {@link BlockState} can start to decay. * - * @return The value for the "decayable" state - * @see Keys#DECAYABLE + * @return The value for the decay distance + * @see Keys#DECAY_DISTANCE */ - Value decayable(); + MutableBoundedValue distance(); + + /** + * Gets the {@link Value} for whether the {@link BlockState} state is + * persistent and will be prevented from decaying. + * + * @return The value for the persistent state + * @see Keys#PERSISTENT + */ + Value persistent(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DirtData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DirtData.java deleted file mode 100644 index 9c9f06c2baa..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DirtData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableDirtData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.DirtType; - -/** - * An {@link VariantData} for the {@link DirtType}. Usually applicable to - * {@link BlockTypes#DIRT}. - * - * @see Keys#DIRT_TYPE - */ -public interface DirtData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DoublePlantData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DoublePlantData.java deleted file mode 100644 index bb5eec087d3..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DoublePlantData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableDoublePlantData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.DoublePlantType; - -/** - * An {@link VariantData} for {@link DoublePlantType}. Usually applicable to - * {@link BlockTypes#DOUBLE_PLANT}. - * - * @see Keys#DOUBLE_PLANT_TYPE - */ -public interface DoublePlantData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DropData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DropData.java index b0d1b5eaea5..76b219684e4 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DropData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DropData.java @@ -36,7 +36,7 @@ * A {@link DataManipulator} for representing the "droppable" state. * If the state is {@code false}, whatever {@link DataHolder} or * {@link ImmutableDataHolder} will not "drop" in the world. Usually applicable - * to {@link BlockTypes#SKULL}. + * to heads or skulls, for example {@link BlockTypes#SKELETON_SKULL}. */ public interface DropData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InWallData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InWallData.java index df533606e3f..be848ffe96d 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InWallData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InWallData.java @@ -34,8 +34,7 @@ /** * An {@link DataManipulator} for the "in-wall" state. Usually means that a * {@link BlockState} will show up graphically as being "attached" to another - * block. Usually applies to {@link BlockTypes#FENCE}s and - * {@link BlockTypes#FENCE_GATE}s. + * block. Usually applies to fence gates, for example {@link BlockTypes#OAK_FENCE_GATE}. */ public interface InWallData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PistonData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InstrumentData.java similarity index 83% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PistonData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InstrumentData.java index d6367d980ef..a62d66c3614 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PistonData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/InstrumentData.java @@ -26,15 +26,16 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutablePistonData; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableInstrumentData; import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.PistonType; +import org.spongepowered.api.data.type.InstrumentType; /** - * Represents the {@link PistonType} of a {@link BlockTypes#PISTON_HEAD}. + * An {@link VariantData} for the {@link InstrumentType} + * of a {@link BlockTypes#NOTE_BLOCK}. * - * @see Keys#PISTON_TYPE + * @see Keys#INSTRUMENT */ -public interface PistonData extends VariantData { +public interface InstrumentData extends VariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LayeredData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LayeredData.java index f4cd24284d9..68f6c0b72a4 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LayeredData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LayeredData.java @@ -34,7 +34,7 @@ /** * An {@link DataManipulator} for the "layer" of a block. Usually this means * that the {@link BlockState} has varying "layers". Usually applies to - * {@link BlockTypes#SNOW_LAYER} or {@link BlockTypes#CAKE}. This is different + * {@link BlockTypes#SNOW} or {@link BlockTypes#CAKE}. This is different * data from {@link FluidLevelData}. */ public interface LayeredData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DisguisedBlockData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LitData.java similarity index 76% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DisguisedBlockData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LitData.java index c37a5f4e718..e80555aeb35 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/DisguisedBlockData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LitData.java @@ -27,16 +27,21 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.DataManipulator; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableDisguisedBlockData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.DisguisedBlockType; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableLitData; +import org.spongepowered.api.data.value.mutable.Value; /** - * A {@link DataManipulator}for a {@link DisguisedBlockType}. Usually - * applicable for {@link BlockTypes#MONSTER_EGG}. - * - * @see Keys#DISGUISED_BLOCK_TYPE + * Represents the {@link DataManipulator} for the state that something is "lit", + * for example a {@link BlockTypes#FURNACE} or {@link BlockTypes#REDSTONE_TORCH}. */ -public interface DisguisedBlockData extends VariantData { +public interface LitData extends DataManipulator { + + /** + * Gets the {@link Value} for the lit state. + * + * @return The value for the lit state + * @see Keys#LIT + */ + Value lit(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LogAxisData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LogAxisData.java deleted file mode 100644 index 4492a70304a..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/LogAxisData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableLogAxisData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.LogAxes; -import org.spongepowered.api.data.type.LogAxis; - -/** - * An {@link VariantData} for the {@link LogAxis}. Usually applies to all types - * of {@link BlockTypes#LOG}. This is fundamentally different from - * {@link AxisData} due to the fact that a log can have a {@link LogAxes#NONE}. - * - * @see Keys#LOG_AXIS - */ -public interface LogAxisData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/tileentity/NoteData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/NoteData.java similarity index 88% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/tileentity/NoteData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/NoteData.java index 9e42cc60729..c1ec0c09982 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/tileentity/NoteData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/NoteData.java @@ -22,18 +22,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.data.manipulator.mutable.tileentity; +package org.spongepowered.api.data.manipulator.mutable.block; -import org.spongepowered.api.block.tileentity.Note; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; import org.spongepowered.api.data.manipulator.DataManipulator; -import org.spongepowered.api.data.manipulator.immutable.tileentity.ImmutableNoteData; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableNoteData; import org.spongepowered.api.data.type.NotePitch; import org.spongepowered.api.data.value.mutable.Value; /** * An {@link DataManipulator} handling the {@link NotePitch} for a - * {@link Note}. + * {@link BlockTypes#NOTE_BLOCK}. */ public interface NoteData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OccupiedData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OccupiedData.java index 1bb370db688..b96c4b521e1 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OccupiedData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OccupiedData.java @@ -32,7 +32,7 @@ /** * Signifies that the block is considered "occupied". Usually applicable to - * {@link BlockTypes#BED}. + * beds, for example {@link BlockTypes#WHITE_BED}. */ public interface OccupiedData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OpenData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OpenData.java index cafdbe0428a..315312c852b 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OpenData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/OpenData.java @@ -32,7 +32,8 @@ /** * Signifies that a block is "open". Usually applicable to - * {@link BlockTypes#WOODEN_DOOR} and other doors. + * doors, trapdoors and gates, for example {@link BlockTypes#OAK_DOOR}, + * {@link BlockTypes#OAK_TRAPDOOR} and {@link BlockTypes#OAK_FENCE_GATE}. */ public interface OpenData extends DataManipulator { diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PlantData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PlantData.java deleted file mode 100644 index cd21665e000..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PlantData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutablePlantData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.PlantType; - -/** - * An {@link VariantData} for the {@link PlantType} state. Usually applicable - * to {@link BlockTypes#RED_FLOWER} and {@link BlockTypes#YELLOW_FLOWER}. - * - * @see Keys#PLANT_TYPE - */ -public interface PlantData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PortionData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PortionData.java index ca1ed2c5fd9..5775a238948 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PortionData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PortionData.java @@ -33,8 +33,8 @@ /** * An {@link VariantData} for the {@link PortionType}. This has some mechanics * with the partial bounding boxes for the actual blocks. Usually applicable - * to {@link BlockTypes#DOUBLE_PLANT}, {@link BlockTypes#STONE_SLAB} - * {@link BlockTypes#WOODEN_DOOR}s, etc. + * to double block plants (e.g {@link BlockTypes#SUNFLOWER}), + * doors (e.g. {@link BlockTypes#OAK_DOOR}), etc. * * @see Keys#PORTION_TYPE */ diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PrismarineData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PrismarineData.java deleted file mode 100644 index 4aebc2a5f96..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/PrismarineData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutablePrismarineData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.PrismarineType; - -/** - * An {@link VariantData} for the {@link PrismarineType}. Usually - * applicable to {@link BlockTypes#PRISMARINE}. - * - * @see Keys#PRISMARINE_TYPE - */ -public interface PrismarineData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandData.java deleted file mode 100644 index 0030388900c..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSandData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.SandType; - -/** - * An {@link VariantData} for the {@link SandType}. Usually applicable to - * {@link BlockTypes#SAND}. - * - * @see Keys#SAND_TYPE - */ -public interface SandData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandstoneData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandstoneData.java deleted file mode 100644 index 8b7f162703f..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SandstoneData.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSandstoneData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.SandstoneType; - -/** - * An {@link VariantData} for the {@link SandstoneType}. Usually - * applicable to {@link BlockTypes#SANDSTONE} and - * {@link BlockTypes#RED_SANDSTONE}. - * - * @see Keys#SANDSTONE_TYPE - */ -public interface SandstoneData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SeamlessData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SeamlessData.java deleted file mode 100644 index 917d148296f..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SeamlessData.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.DataManipulator; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSeamlessData; -import org.spongepowered.api.data.value.mutable.Value; - -/** - * A {@link DataManipulator} for the "seamless" state. This is normally a - * simple visual change for the applicable block types of - * {@link BlockTypes#DOUBLE_STONE_SLAB}, {@link BlockTypes#DOUBLE_STONE_SLAB2}, - * and {@link BlockTypes#DOUBLE_WOODEN_SLAB}. - */ -public interface SeamlessData extends DataManipulator { - - /** - * Gets the {@link Value} for the "seamless" state. - * - * @return The immutable value for the "seamless" state - * @see Keys#SEAMLESS - */ - Value seamless(); - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ShrubData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ShrubData.java deleted file mode 100644 index 298b5220a8a..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/ShrubData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableShrubData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.ShrubType; - -/** - * A {@link VariantData} for the {@link ShrubType}. Usually applicable to - * {@link BlockTypes#TALLGRASS}. - * - * @see Keys#SHRUB_TYPE - */ -public interface ShrubData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabData.java deleted file mode 100644 index bc3483a56b8..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSlabData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.SlabType; - -/** - * A {@link VariantData} for the {@link SlabType}. Usually applicable - * to {@link BlockTypes#STONE_SLAB} and {@link BlockTypes#STONE_SLAB2}, etc. - * - * @see Keys#SLAB_TYPE - */ -public interface SlabData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/QuartzData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabPortionData.java similarity index 77% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/block/QuartzData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabPortionData.java index e158249b40f..0e611374b8e 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/QuartzData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SlabPortionData.java @@ -24,18 +24,16 @@ */ package org.spongepowered.api.data.manipulator.mutable.block; -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableQuartzData; +import org.spongepowered.api.block.BlockState; +import org.spongepowered.api.data.manipulator.DataManipulator; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSlabPortionData; import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.QuartzType; +import org.spongepowered.api.data.type.SlabPortion; /** - * A {@link VariantData} for the {@link QuartzType}. Usually applicable to - * {@link BlockTypes#QUARTZ_BLOCK}. - * - * @see Keys#QUARTZ_TYPE + * An {@link DataManipulator} handling the value of the + * {@link SlabPortion} of a {@link BlockState} at a location. */ -public interface QuartzData extends VariantData { +public interface SlabPortionData extends VariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/StoneData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/StoneData.java deleted file mode 100644 index 02bd15a7065..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/StoneData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableStoneData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.StoneType; - -/** - * A {@link VariantData} for the {@link StoneType}. Usually applicable to - * {@link BlockTypes#STONE}. - * - * @see Keys#STONE_TYPE - */ -public interface StoneData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BrickData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SurfaceAttachmentData.java similarity index 82% rename from src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BrickData.java rename to src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SurfaceAttachmentData.java index 976f7ed6525..abab0949bcf 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/BrickData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/SurfaceAttachmentData.java @@ -24,18 +24,17 @@ */ package org.spongepowered.api.data.manipulator.mutable.block; -import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableBrickData; +import org.spongepowered.api.data.manipulator.immutable.block.ImmutableSurfaceAttachmentData; import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.BrickType; +import org.spongepowered.api.data.type.Surface; /** - * Represents the type of {@link BrickType} for a - * {@link BlockTypes#STONEBRICK}. + * An {@link VariantData} for the attachment + * {@link Surface} of buttons and levers. * - * @see Keys#BRICK_TYPE + * @see Keys#ATTACHMENT_SURFACE */ -public interface BrickData extends VariantData { +public interface SurfaceAttachmentData extends VariantData { } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/TreeData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/TreeData.java deleted file mode 100644 index 88e7d479500..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/TreeData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableTreeData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.TreeType; - -/** - * An {@link VariantData} for the {@link TreeType}. The main use for this type - * is for a visual difference in the types of tree related blocks. Usually - * applicable to {@link BlockTypes#SAPLING}, {@link BlockTypes#PLANKS}, - * {@link BlockTypes#LOG}, etc. - * - * @see Keys#TREE_TYPE - */ -public interface TreeData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/WallData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/WallData.java deleted file mode 100644 index 69b7e832ba2..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/block/WallData.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.block; - -import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.block.ImmutableWallData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.WallType; - -/** - * An {@link VariantData} for the {@link WallType}. Usually applicable to - * {@link BlockTypes#COBBLESTONE_WALL}. - * - * @see Keys#WALL_TYPE - */ -public interface WallData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/entity/PersistingData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/entity/PersistingData.java index 1fa161ebf91..849f1481bd6 100644 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/entity/PersistingData.java +++ b/src/main/java/org/spongepowered/api/data/manipulator/mutable/entity/PersistingData.java @@ -45,8 +45,8 @@ public interface PersistingData extends DataManipulator persists(); + Value persistent(); } diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CoalData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CoalData.java deleted file mode 100644 index b5262f4f808..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CoalData.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.item; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.item.ImmutableCoalData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.CoalType; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link VariantData} handling the {@link CoalType} of an - * {@link ItemStack} of the {@link ItemTypes#COAL}. - * - * @see Keys#COAL_TYPE - */ -public interface CoalData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CookedFishData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CookedFishData.java deleted file mode 100644 index 081c69dea86..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/CookedFishData.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.item; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.item.ImmutableCookedFishData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.CookedFish; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link VariantData} handling the {@link CookedFish} of an - * {@link ItemStack} of the {@link ItemTypes#COOKED_FISH}. - * - * @see Keys#COOKED_FISH - */ -public interface CookedFishData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/FishData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/FishData.java deleted file mode 100644 index fd14a2d5a5c..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/FishData.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.item; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.item.ImmutableFishData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.Fish; -import org.spongepowered.api.item.ItemTypes; -import org.spongepowered.api.item.inventory.ItemStack; - -/** - * A type of {@link VariantData} handling the {@link Fish} of an - * {@link ItemStack} of the {@link ItemTypes#FISH}. - * - *

Since different types of fish have different properties, it is - * recommended to further check the specific item properties associated with - * the fish type from the item stack after changing this data.

- * - * @see Keys#FISH_TYPE - */ -public interface FishData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/GoldenAppleData.java b/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/GoldenAppleData.java deleted file mode 100644 index 0c76dc5da93..00000000000 --- a/src/main/java/org/spongepowered/api/data/manipulator/mutable/item/GoldenAppleData.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.manipulator.mutable.item; - -import org.spongepowered.api.data.key.Keys; -import org.spongepowered.api.data.manipulator.immutable.item.ImmutableGoldenAppleData; -import org.spongepowered.api.data.manipulator.mutable.VariantData; -import org.spongepowered.api.data.type.GoldenApple; - -/** - * Represents the type of {@link GoldenApple} the golden apple item is. - * - *

Since different types of golden apples have different properties, it is - * recommended to further check the specific item properties associated with - * the golden apple type from the item stack after changing this data.

- * - * @see Keys#GOLDEN_APPLE_TYPE - */ -public interface GoldenAppleData extends VariantData { - -} diff --git a/src/main/java/org/spongepowered/api/data/property/item/RecordProperty.java b/src/main/java/org/spongepowered/api/data/property/item/MusicDiscProperty.java similarity index 74% rename from src/main/java/org/spongepowered/api/data/property/item/RecordProperty.java rename to src/main/java/org/spongepowered/api/data/property/item/MusicDiscProperty.java index 35b7b211e17..cfba1f1f29b 100644 --- a/src/main/java/org/spongepowered/api/data/property/item/RecordProperty.java +++ b/src/main/java/org/spongepowered/api/data/property/item/MusicDiscProperty.java @@ -28,30 +28,25 @@ import org.spongepowered.api.data.Property; import org.spongepowered.api.data.property.AbstractProperty; -import org.spongepowered.api.effect.sound.record.RecordType; +import org.spongepowered.api.effect.sound.music.MusicDisc; import org.spongepowered.api.item.ItemType; import org.spongepowered.api.item.inventory.ItemStack; /** - * A {@link RecordProperty} used to retrieve a {@link RecordType} + * A {@link MusicDiscProperty} used to retrieve a {@link MusicDisc} * from a {@link ItemType} or {@link ItemStack}. */ -public final class RecordProperty extends AbstractProperty { +public final class MusicDiscProperty extends AbstractProperty { - /** - * Constructs a new record property with the specified record type. - * - * @param instrument The record type the record plays - */ - public RecordProperty(RecordType instrument) { - super(checkNotNull(instrument, "instrument")); + public MusicDiscProperty(MusicDisc musicDiscType) { + super(checkNotNull(musicDiscType, "musicDiscType")); } @Override public int compareTo(Property o) { - if (!(o instanceof RecordProperty)) { + if (!(o instanceof MusicDiscProperty)) { return -1; } - return getValue().getKey().compareTo(((RecordProperty) o).getValue().getKey()); + return getValue().getKey().compareTo(((MusicDiscProperty) o).getValue().getKey()); } } diff --git a/src/main/java/org/spongepowered/api/data/type/BigMushroomType.java b/src/main/java/org/spongepowered/api/data/type/BigMushroomType.java deleted file mode 100644 index c51b5bccfae..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/BigMushroomType.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents the various "sided" big mushroom block types. - */ -@CatalogedBy(BigMushroomTypes.class) -public interface BigMushroomType extends CatalogType { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/BigMushroomTypes.java b/src/main/java/org/spongepowered/api/data/type/BigMushroomTypes.java deleted file mode 100644 index be5ed1cd97b..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/BigMushroomTypes.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link BigMushroomType}s. - */ -public final class BigMushroomTypes { - - // SORTFIELDS:ON - - public static final BigMushroomType ALL_INSIDE = DummyObjectProvider.createFor(BigMushroomType.class, "ALL_INSIDE"); - - public static final BigMushroomType ALL_OUTSIDE = DummyObjectProvider.createFor(BigMushroomType.class, "ALL_OUTSIDE"); - - public static final BigMushroomType ALL_STEM = DummyObjectProvider.createFor(BigMushroomType.class, "ALL_STEM"); - - public static final BigMushroomType CENTER = DummyObjectProvider.createFor(BigMushroomType.class, "CENTER"); - - public static final BigMushroomType EAST = DummyObjectProvider.createFor(BigMushroomType.class, "EAST"); - - public static final BigMushroomType NORTH = DummyObjectProvider.createFor(BigMushroomType.class, "NORTH"); - - public static final BigMushroomType NORTH_EAST = DummyObjectProvider.createFor(BigMushroomType.class, "NORTH_EAST"); - - public static final BigMushroomType NORTH_WEST = DummyObjectProvider.createFor(BigMushroomType.class, "NORTH_WEST"); - - public static final BigMushroomType SOUTH = DummyObjectProvider.createFor(BigMushroomType.class, "SOUTH"); - - public static final BigMushroomType SOUTH_EAST = DummyObjectProvider.createFor(BigMushroomType.class, "SOUTH_EAST"); - - public static final BigMushroomType SOUTH_WEST = DummyObjectProvider.createFor(BigMushroomType.class, "SOUTH_WEST"); - - public static final BigMushroomType STEM = DummyObjectProvider.createFor(BigMushroomType.class, "STEM"); - - public static final BigMushroomType WEST = DummyObjectProvider.createFor(BigMushroomType.class, "WEST"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private BigMushroomTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/BrickType.java b/src/main/java/org/spongepowered/api/data/type/BrickType.java deleted file mode 100644 index 809515e782b..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/BrickType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of "brick". - */ -@CatalogedBy(BrickTypes.class) -public interface BrickType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/BrickTypes.java b/src/main/java/org/spongepowered/api/data/type/BrickTypes.java deleted file mode 100644 index d4d71fcfc48..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/BrickTypes.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link BrickType}s. - */ -public final class BrickTypes { - - // SORTFIELDS:ON - - public static final BrickType CHISELED = DummyObjectProvider.createFor(BrickType.class, "CHISELED"); - - public static final BrickType CRACKED = DummyObjectProvider.createFor(BrickType.class, "CRACKED"); - - public static final BrickType DEFAULT = DummyObjectProvider.createFor(BrickType.class, "DEFAULT"); - - public static final BrickType MOSSY = DummyObjectProvider.createFor(BrickType.class, "MOSSY"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private BrickTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/ShrubType.java b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java similarity index 84% rename from src/main/java/org/spongepowered/api/data/type/ShrubType.java rename to src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java index 6ac70b345a3..b6b290b9262 100644 --- a/src/main/java/org/spongepowered/api/data/type/ShrubType.java +++ b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentType.java @@ -26,14 +26,14 @@ import org.spongepowered.api.CatalogType; import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.text.translation.Translatable; import org.spongepowered.api.util.annotation.CatalogedBy; /** - * Represents a type of shrub. Usually applicable to - * {@link BlockTypes#TALLGRASS}. + * Represents the attachment type of a {@link BlockTypes#CHEST} + * or {@link BlockTypes#TRAPPED_CHEST}, this is what combines two + * chests into a double chests. */ -@CatalogedBy(ShrubTypes.class) -public interface ShrubType extends CatalogType, Translatable { +@CatalogedBy(ChestAttachmentTypes.class) +public interface ChestAttachmentType extends CatalogType { } diff --git a/src/main/java/org/spongepowered/api/data/type/CookedFishes.java b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java similarity index 73% rename from src/main/java/org/spongepowered/api/data/type/CookedFishes.java rename to src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java index 45e81599556..8961c939bfd 100644 --- a/src/main/java/org/spongepowered/api/data/type/CookedFishes.java +++ b/src/main/java/org/spongepowered/api/data/type/ChestAttachmentTypes.java @@ -27,21 +27,21 @@ import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; /** - * An enumeration of known {@link CookedFish} types. + * An enumeration of all the {@link ChestAttachmentType}s in vanilla minecraft. */ -public final class CookedFishes { +public final class ChestAttachmentTypes { // SORTFIELDS:ON - public static final CookedFish COD = DummyObjectProvider.createFor(CookedFish.class, "COD"); + public static final ChestAttachmentType LEFT = DummyObjectProvider.createFor(ChestAttachmentType.class, "LEFT"); - public static final CookedFish SALMON = DummyObjectProvider.createFor(CookedFish.class, "SALMON"); + public static final ChestAttachmentType NONE = DummyObjectProvider.createFor(ChestAttachmentType.class, "NONE"); + + public static final ChestAttachmentType RIGHT = DummyObjectProvider.createFor(ChestAttachmentType.class, "RIGHT"); // SORTFIELDS:OFF - // Suppress default constructor to ensure non-instantiability. - private CookedFishes() { - throw new AssertionError("You should not be attempting to instantiate this class."); + private ChestAttachmentTypes() { } } diff --git a/src/main/java/org/spongepowered/api/data/type/CoalType.java b/src/main/java/org/spongepowered/api/data/type/CoalType.java deleted file mode 100644 index 787c50b482d..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/CoalType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents the type of coal. - */ -@CatalogedBy(CoalTypes.class) -public interface CoalType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/CookedFish.java b/src/main/java/org/spongepowered/api/data/type/CookedFish.java deleted file mode 100644 index b0a383d7081..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/CookedFish.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of cooked fish. - */ -@CatalogedBy(CookedFishes.class) -public interface CookedFish extends CatalogType, Translatable { - - /** - * Gets this cooked fish type's corresponding {@link Fish} type. - * - * @return The raw fish type. - */ - Fish getRawFish(); -} diff --git a/src/main/java/org/spongepowered/api/data/type/DirtTypes.java b/src/main/java/org/spongepowered/api/data/type/DirtTypes.java deleted file mode 100644 index ccc118a9fa9..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/DirtTypes.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link DirtType}s. - */ -public final class DirtTypes { - - // SORTFIELDS:ON - - public static final DirtType COARSE_DIRT = DummyObjectProvider.createFor(DirtType.class, "COARSE_DIRT"); - - public static final DirtType DIRT = DummyObjectProvider.createFor(DirtType.class, "DIRT"); - - public static final DirtType PODZOL = DummyObjectProvider.createFor(DirtType.class, "PODZOL"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private DirtTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/DisguisedBlockType.java b/src/main/java/org/spongepowered/api/data/type/DisguisedBlockType.java deleted file mode 100644 index 09788f5e6ef..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/DisguisedBlockType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of "disguised" block that mimics the look of another - * block. - */ -@CatalogedBy(DisguisedBlockTypes.class) -public interface DisguisedBlockType extends CatalogType { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/DisguisedBlockTypes.java b/src/main/java/org/spongepowered/api/data/type/DisguisedBlockTypes.java deleted file mode 100644 index ea481dcec47..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/DisguisedBlockTypes.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link DisguisedBlockType}s. - */ -public final class DisguisedBlockTypes { - - // SORTFIELDS:ON - - public static final DisguisedBlockType CHISELED_STONEBRICK = DummyObjectProvider.createFor(DisguisedBlockType.class, "CHISELED_STONEBRICK"); - - public static final DisguisedBlockType COBBLESTONE = DummyObjectProvider.createFor(DisguisedBlockType.class, "COBBLESTONE"); - - public static final DisguisedBlockType CRACKED_STONEBRICK = DummyObjectProvider.createFor(DisguisedBlockType.class, "CRACKED_STONEBRICK"); - - public static final DisguisedBlockType MOSSY_STONEBRICK = DummyObjectProvider.createFor(DisguisedBlockType.class, "MOSSY_STONEBRICK"); - - public static final DisguisedBlockType STONE = DummyObjectProvider.createFor(DisguisedBlockType.class, "STONE"); - - public static final DisguisedBlockType STONEBRICK = DummyObjectProvider.createFor(DisguisedBlockType.class, "STONEBRICK"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private DisguisedBlockTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/DoublePlantType.java b/src/main/java/org/spongepowered/api/data/type/DoublePlantType.java deleted file mode 100644 index 33486cfe5ed..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/DoublePlantType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of double plant. - */ -@CatalogedBy(DoublePlantTypes.class) -public interface DoublePlantType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/DoublePlantTypes.java b/src/main/java/org/spongepowered/api/data/type/DoublePlantTypes.java deleted file mode 100644 index cc28677766f..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/DoublePlantTypes.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link DoublePlantType}s. - */ -public final class DoublePlantTypes { - - // SORTFIELDS:ON - - public static final DoublePlantType FERN = DummyObjectProvider.createFor(DoublePlantType.class, "FERN"); - - public static final DoublePlantType GRASS = DummyObjectProvider.createFor(DoublePlantType.class, "GRASS"); - - public static final DoublePlantType PAEONIA = DummyObjectProvider.createFor(DoublePlantType.class, "PAEONIA"); - - public static final DoublePlantType ROSE = DummyObjectProvider.createFor(DoublePlantType.class, "ROSE"); - - public static final DoublePlantType SUNFLOWER = DummyObjectProvider.createFor(DoublePlantType.class, "SUNFLOWER"); - - public static final DoublePlantType SYRINGA = DummyObjectProvider.createFor(DoublePlantType.class, "SYRINGA"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private DoublePlantTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/Fish.java b/src/main/java/org/spongepowered/api/data/type/Fish.java deleted file mode 100644 index db143f80f1c..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/Fish.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -import java.util.Optional; - -/** - * Represents a type of raw fish item. - */ -@CatalogedBy(Fishes.class) -public interface Fish extends CatalogType, Translatable { - - /** - * Gets this raw fish type's corresponding {@link CookedFish} type. - * - * @return The cooked fish type, if available - */ - Optional getCookedFish(); -} diff --git a/src/main/java/org/spongepowered/api/data/type/Fishes.java b/src/main/java/org/spongepowered/api/data/type/Fishes.java deleted file mode 100644 index ef236a6b41b..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/Fishes.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known {@link Fish} types. - */ -public final class Fishes { - - // SORTFIELDS:ON - - public static final Fish CLOWNFISH = DummyObjectProvider.createFor(Fish.class, "CLOWNFISH"); - - public static final Fish COD = DummyObjectProvider.createFor(Fish.class, "COD"); - - public static final Fish PUFFERFISH = DummyObjectProvider.createFor(Fish.class, "PUFFERFISH"); - - public static final Fish SALMON = DummyObjectProvider.createFor(Fish.class, "SALMON"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private Fishes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/GoldenApple.java b/src/main/java/org/spongepowered/api/data/type/GoldenApple.java deleted file mode 100644 index e1640cec17c..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/GoldenApple.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of golden apple. - */ -@CatalogedBy(GoldenApples.class) -public interface GoldenApple extends CatalogType { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/GoldenApples.java b/src/main/java/org/spongepowered/api/data/type/GoldenApples.java deleted file mode 100644 index 1141852076e..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/GoldenApples.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known {@link GoldenApple} types. - */ -public final class GoldenApples { - - // SORTFIELDS:ON - - public static final GoldenApple ENCHANTED_GOLDEN_APPLE = DummyObjectProvider.createFor(GoldenApple.class, "ENCHANTED_GOLDEN_APPLE"); - - public static final GoldenApple GOLDEN_APPLE = DummyObjectProvider.createFor(GoldenApple.class, "GOLDEN_APPLE"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private GoldenApples() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/LogAxes.java b/src/main/java/org/spongepowered/api/data/type/LogAxes.java deleted file mode 100644 index 538407a3a44..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/LogAxes.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class LogAxes { - - // SORTFIELDS:ON - - public static final LogAxis NONE = DummyObjectProvider.createFor(LogAxis.class, "NONE"); - - public static final LogAxis X = DummyObjectProvider.createFor(LogAxis.class, "X"); - - public static final LogAxis Y = DummyObjectProvider.createFor(LogAxis.class, "Y"); - - public static final LogAxis Z = DummyObjectProvider.createFor(LogAxis.class, "Z"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private LogAxes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/LogAxis.java b/src/main/java/org/spongepowered/api/data/type/LogAxis.java deleted file mode 100644 index 16a9398d16e..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/LogAxis.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.util.Cycleable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(LogAxes.class) -public interface LogAxis extends CatalogType, Cycleable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/NotePitch.java b/src/main/java/org/spongepowered/api/data/type/NotePitch.java index 239518e9673..a93c2c2a97c 100644 --- a/src/main/java/org/spongepowered/api/data/type/NotePitch.java +++ b/src/main/java/org/spongepowered/api/data/type/NotePitch.java @@ -25,12 +25,12 @@ package org.spongepowered.api.data.type; import org.spongepowered.api.CatalogType; -import org.spongepowered.api.block.tileentity.Note; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.util.Cycleable; import org.spongepowered.api.util.annotation.CatalogedBy; /** - * Represents a NotePitch which may be played by a {@link Note} block. + * Represents a NotePitch which may be played by a {@link BlockTypes#NOTE_BLOCK}. */ @CatalogedBy(NotePitches.class) public interface NotePitch extends CatalogType, Cycleable { diff --git a/src/main/java/org/spongepowered/api/data/type/PistonType.java b/src/main/java/org/spongepowered/api/data/type/PistonType.java deleted file mode 100644 index 6fb07b2e622..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PistonType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a "type" of piston. - */ -@CatalogedBy(PistonTypes.class) -public interface PistonType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/PistonTypes.java b/src/main/java/org/spongepowered/api/data/type/PistonTypes.java deleted file mode 100644 index 2dc7f7c789f..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PistonTypes.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of vanilla known {@link PistonType}s. - */ -public final class PistonTypes { - - // SORTFIELDS:ON - - public static final PistonType NORMAL = DummyObjectProvider.createFor(PistonType.class, "NORMAL"); - - public static final PistonType STICKY = DummyObjectProvider.createFor(PistonType.class, "STICKY"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private PistonTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/PlantType.java b/src/main/java/org/spongepowered/api/data/type/PlantType.java deleted file mode 100644 index 03705821783..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PlantType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(PlantTypes.class) -public interface PlantType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/PlantTypes.java b/src/main/java/org/spongepowered/api/data/type/PlantTypes.java deleted file mode 100644 index 2488e89cc61..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PlantTypes.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class PlantTypes { - - // SORTFIELDS:ON - - public static final PlantType ALLIUM = DummyObjectProvider.createFor(PlantType.class, "ALLIUM"); - - public static final PlantType BLUE_ORCHID = DummyObjectProvider.createFor(PlantType.class, "BLUE_ORCHID"); - - public static final PlantType DANDELION = DummyObjectProvider.createFor(PlantType.class, "DANDELION"); - - public static final PlantType HOUSTONIA = DummyObjectProvider.createFor(PlantType.class, "HOUSTONIA"); - - public static final PlantType ORANGE_TULIP = DummyObjectProvider.createFor(PlantType.class, "ORANGE_TULIP"); - - public static final PlantType OXEYE_DAISY = DummyObjectProvider.createFor(PlantType.class, "OXEYE_DAISY"); - - public static final PlantType PINK_TULIP = DummyObjectProvider.createFor(PlantType.class, "PINK_TULIP"); - - public static final PlantType POPPY = DummyObjectProvider.createFor(PlantType.class, "POPPY"); - - public static final PlantType RED_TULIP = DummyObjectProvider.createFor(PlantType.class, "RED_TULIP"); - - public static final PlantType WHITE_TULIP = DummyObjectProvider.createFor(PlantType.class, "WHITE_TULIP"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private PlantTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/PrismarineType.java b/src/main/java/org/spongepowered/api/data/type/PrismarineType.java deleted file mode 100644 index 89128bf424d..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PrismarineType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(PrismarineTypes.class) -public interface PrismarineType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/PrismarineTypes.java b/src/main/java/org/spongepowered/api/data/type/PrismarineTypes.java deleted file mode 100644 index 183e8f2b8cf..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/PrismarineTypes.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public class PrismarineTypes { - - // SORTFIELDS:ON - - public static final PrismarineType BRICKS = DummyObjectProvider.createFor(PrismarineType.class, "BRICKS"); - - public static final PrismarineType DARK = DummyObjectProvider.createFor(PrismarineType.class, "DARK"); - - public static final PrismarineType ROUGH = DummyObjectProvider.createFor(PrismarineType.class, "ROUGH"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private PrismarineTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/QuartzType.java b/src/main/java/org/spongepowered/api/data/type/QuartzType.java deleted file mode 100644 index b6d3fae397c..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/QuartzType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(QuartzTypes.class) -public interface QuartzType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/QuartzTypes.java b/src/main/java/org/spongepowered/api/data/type/QuartzTypes.java deleted file mode 100644 index 5e030d5a87f..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/QuartzTypes.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class QuartzTypes { - - // SORTFIELDS:ON - - public static final QuartzType CHISELED = DummyObjectProvider.createFor(QuartzType.class, "CHISELED"); - - public static final QuartzType DEFAULT = DummyObjectProvider.createFor(QuartzType.class, "DEFAULT"); - - public static final QuartzType LINES_X = DummyObjectProvider.createFor(QuartzType.class, "LINES_X"); - - public static final QuartzType LINES_Y = DummyObjectProvider.createFor(QuartzType.class, "LINES_Y"); - - public static final QuartzType LINES_Z = DummyObjectProvider.createFor(QuartzType.class, "LINES_Z"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private QuartzTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/SandType.java b/src/main/java/org/spongepowered/api/data/type/SandType.java deleted file mode 100644 index 44a33108f41..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SandType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of "sand". - */ -@CatalogedBy(SandTypes.class) -public interface SandType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/SandstoneType.java b/src/main/java/org/spongepowered/api/data/type/SandstoneType.java deleted file mode 100644 index 258fdb132bf..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SandstoneType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(SandstoneTypes.class) -public interface SandstoneType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/SandstoneTypes.java b/src/main/java/org/spongepowered/api/data/type/SandstoneTypes.java deleted file mode 100644 index ea2f162c2a1..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SandstoneTypes.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class SandstoneTypes { - - // SORTFIELDS:ON - - public static final SandstoneType CHISELED = DummyObjectProvider.createFor(SandstoneType.class, "CHISELED"); - - public static final SandstoneType DEFAULT = DummyObjectProvider.createFor(SandstoneType.class, "DEFAULT"); - - public static final SandstoneType SMOOTH = DummyObjectProvider.createFor(SandstoneType.class, "SMOOTH"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private SandstoneTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/ShrubTypes.java b/src/main/java/org/spongepowered/api/data/type/ShrubTypes.java deleted file mode 100644 index 3bde5bf51ff..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/ShrubTypes.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of vanilla known {@link ShrubType}s. - */ -public class ShrubTypes { - - // SORTFIELDS:ON - - public static final ShrubType DEAD_BUSH = DummyObjectProvider.createFor(ShrubType.class, "DEAD_BUSH"); - - public static final ShrubType FERN = DummyObjectProvider.createFor(ShrubType.class, "FERN"); - - public static final ShrubType TALL_GRASS = DummyObjectProvider.createFor(ShrubType.class, "TALL_GRASS"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private ShrubTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/SkullType.java b/src/main/java/org/spongepowered/api/data/type/SkullType.java deleted file mode 100644 index 7dd4cd88894..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SkullType.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -/** - * Represents a type of skull. - */ -@CatalogedBy(SkullTypes.class) -public interface SkullType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/SkullTypes.java b/src/main/java/org/spongepowered/api/data/type/SkullTypes.java deleted file mode 100644 index 6ea61b3d9c9..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SkullTypes.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of all possible {@link SkullType}s in vanilla minecraft. - */ -public final class SkullTypes { - - // SORTFIELDS:ON - - public static final SkullType CREEPER = DummyObjectProvider.createFor(SkullType.class, "CREEPER"); - - public static final SkullType ENDER_DRAGON = DummyObjectProvider.createFor(SkullType.class, "ENDER_DRAGON"); - - public static final SkullType PLAYER = DummyObjectProvider.createFor(SkullType.class, "PLAYER"); - - public static final SkullType SKELETON = DummyObjectProvider.createFor(SkullType.class, "SKELETON"); - - public static final SkullType WITHER_SKELETON = DummyObjectProvider.createFor(SkullType.class, "WITHER_SKELETON"); - - public static final SkullType ZOMBIE = DummyObjectProvider.createFor(SkullType.class, "ZOMBIE"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private SkullTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/DirtType.java b/src/main/java/org/spongepowered/api/data/type/SlabPortion.java similarity index 86% rename from src/main/java/org/spongepowered/api/data/type/DirtType.java rename to src/main/java/org/spongepowered/api/data/type/SlabPortion.java index 37392a3da2a..3754b0fe009 100644 --- a/src/main/java/org/spongepowered/api/data/type/DirtType.java +++ b/src/main/java/org/spongepowered/api/data/type/SlabPortion.java @@ -26,13 +26,13 @@ import org.spongepowered.api.CatalogType; import org.spongepowered.api.block.BlockTypes; -import org.spongepowered.api.text.translation.Translatable; import org.spongepowered.api.util.annotation.CatalogedBy; /** - * Represents the {@link DirtType} of a {@link BlockTypes#DIRT}. + * Represents the portion of a slab block, for + * example {@link BlockTypes#STONE_SLAB}. */ -@CatalogedBy(DirtTypes.class) -public interface DirtType extends CatalogType, Translatable { +@CatalogedBy(SlabPortions.class) +public interface SlabPortion extends CatalogType { } diff --git a/src/main/java/org/spongepowered/api/data/type/CoalTypes.java b/src/main/java/org/spongepowered/api/data/type/SlabPortions.java similarity index 75% rename from src/main/java/org/spongepowered/api/data/type/CoalTypes.java rename to src/main/java/org/spongepowered/api/data/type/SlabPortions.java index 2814c708ea7..00cdc030ae4 100644 --- a/src/main/java/org/spongepowered/api/data/type/CoalTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/SlabPortions.java @@ -27,21 +27,21 @@ import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; /** - * An enumeration of various {@link CoalType}s. + * An enumeration of known {@link SlabPortion}s. */ -public final class CoalTypes { +public final class SlabPortions { // SORTFIELDS:ON - public static final CoalType CHARCOAL = DummyObjectProvider.createFor(CoalType.class, "CHARCOAL"); + public static final SlabPortion BOTTOM = DummyObjectProvider.createFor(SlabPortion.class, "BOTTOM"); - public static final CoalType COAL = DummyObjectProvider.createFor(CoalType.class, "COAL"); + public static final SlabPortion FULL = DummyObjectProvider.createFor(SlabPortion.class, "FULL"); + + public static final SlabPortion TOP = DummyObjectProvider.createFor(SlabPortion.class, "TOP"); // SORTFIELDS:OFF - // Suppress default constructor to ensure non-instantiability. - private CoalTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); + private SlabPortions() { } } diff --git a/src/main/java/org/spongepowered/api/data/type/SlabType.java b/src/main/java/org/spongepowered/api/data/type/SlabType.java deleted file mode 100644 index 253b012f519..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/SlabType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(SlabTypes.class) -public interface SlabType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/StoneType.java b/src/main/java/org/spongepowered/api/data/type/StoneType.java deleted file mode 100644 index c6fd028a112..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/StoneType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.CatalogType; -import org.spongepowered.api.text.translation.Translatable; -import org.spongepowered.api.util.annotation.CatalogedBy; - -@CatalogedBy(StoneTypes.class) -public interface StoneType extends CatalogType, Translatable { - -} diff --git a/src/main/java/org/spongepowered/api/data/type/StoneTypes.java b/src/main/java/org/spongepowered/api/data/type/StoneTypes.java deleted file mode 100644 index df2ddcd6919..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/StoneTypes.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class StoneTypes { - - // SORTFIELDS:ON - - public static final StoneType ANDESITE = DummyObjectProvider.createFor(StoneType.class, "ANDESITE"); - - public static final StoneType DIORITE = DummyObjectProvider.createFor(StoneType.class, "DIORITE"); - - public static final StoneType GRANITE = DummyObjectProvider.createFor(StoneType.class, "GRANITE"); - - public static final StoneType SMOOTH_ANDESITE = DummyObjectProvider.createFor(StoneType.class, "SMOOTH_ANDESITE"); - - public static final StoneType SMOOTH_DIORITE = DummyObjectProvider.createFor(StoneType.class, "SMOOTH_DIORITE"); - - public static final StoneType SMOOTH_GRANITE = DummyObjectProvider.createFor(StoneType.class, "SMOOTH_GRANITE"); - - public static final StoneType STONE = DummyObjectProvider.createFor(StoneType.class, "STONE"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private StoneTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/data/type/WallType.java b/src/main/java/org/spongepowered/api/data/type/Surface.java similarity index 92% rename from src/main/java/org/spongepowered/api/data/type/WallType.java rename to src/main/java/org/spongepowered/api/data/type/Surface.java index d8bfcb19275..83d6507b52f 100644 --- a/src/main/java/org/spongepowered/api/data/type/WallType.java +++ b/src/main/java/org/spongepowered/api/data/type/Surface.java @@ -28,9 +28,9 @@ import org.spongepowered.api.util.annotation.CatalogedBy; /** - * Represents a type of wall. + * Represents a block surface. */ -@CatalogedBy(WallTypes.class) -public interface WallType extends CatalogType { +@CatalogedBy(Surfaces.class) +public interface Surface extends CatalogType { } diff --git a/src/main/java/org/spongepowered/api/data/type/SandTypes.java b/src/main/java/org/spongepowered/api/data/type/Surfaces.java similarity index 75% rename from src/main/java/org/spongepowered/api/data/type/SandTypes.java rename to src/main/java/org/spongepowered/api/data/type/Surfaces.java index 20be5835330..dde356c4c4b 100644 --- a/src/main/java/org/spongepowered/api/data/type/SandTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/Surfaces.java @@ -27,21 +27,20 @@ import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; /** - * An enumeration of known vanilla {@link SandType}s. + * An enumeration of all the vanilla {@link Surface}s. */ -public final class SandTypes { +public final class Surfaces { // SORTFIELDS:ON - public static final SandType NORMAL = DummyObjectProvider.createFor(SandType.class, "NORMAL"); + public static final Surface CEILING = DummyObjectProvider.createFor(Surface.class, "CEILING"); - public static final SandType RED = DummyObjectProvider.createFor(SandType.class, "RED"); + public static final Surface FLOOR = DummyObjectProvider.createFor(Surface.class, "FLOOR"); + + public static final Surface WALL = DummyObjectProvider.createFor(Surface.class, "WALL"); // SORTFIELDS:OFF - // Suppress default constructor to ensure non-instantiability. - private SandTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); + private Surfaces() { } - } diff --git a/src/main/java/org/spongepowered/api/data/type/WallTypes.java b/src/main/java/org/spongepowered/api/data/type/WallTypes.java deleted file mode 100644 index fbba11f3da8..00000000000 --- a/src/main/java/org/spongepowered/api/data/type/WallTypes.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.data.type; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -/** - * An enumeration of known vanilla {@link WallType}s. - */ -public final class WallTypes { - - // SORTFIELDS:ON - - public static final WallType MOSSY = DummyObjectProvider.createFor(WallType.class, "MOSSY"); - - public static final WallType NORMAL = DummyObjectProvider.createFor(WallType.class, "NORMAL"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private WallTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/effect/Viewer.java b/src/main/java/org/spongepowered/api/effect/Viewer.java index ba7dc890ebc..19446852d0b 100644 --- a/src/main/java/org/spongepowered/api/effect/Viewer.java +++ b/src/main/java/org/spongepowered/api/effect/Viewer.java @@ -29,11 +29,11 @@ import com.flowpowered.math.vector.Vector3d; import com.flowpowered.math.vector.Vector3i; import org.spongepowered.api.block.BlockState; +import org.spongepowered.api.effect.sound.music.MusicDisc; import org.spongepowered.api.effect.particle.ParticleEffect; import org.spongepowered.api.effect.sound.SoundCategories; import org.spongepowered.api.effect.sound.SoundCategory; import org.spongepowered.api.effect.sound.SoundType; -import org.spongepowered.api.effect.sound.record.RecordType; import org.spongepowered.api.text.BookView; import org.spongepowered.api.text.title.Title; import org.spongepowered.api.world.World; @@ -182,22 +182,22 @@ default void playSound(SoundType sound, Vector3d position, double volume, double void stopSounds(SoundType sound, SoundCategory category); /** - * Plays the given {@link RecordType} at the given position. The benefit of playing - * {@link RecordType} instead of a {@link SoundType} allows you to stop them through - * the {@link #stopRecord(Vector3i)}. Playing a new {@link RecordType} at the same + * Plays the given {@link MusicDisc} at the given position. The benefit of playing + * {@link MusicDisc} instead of a {@link SoundType} allows you to stop them through + * the {@link #stopMusicDisc(Vector3i)}. Playing a new {@link MusicDisc} at the same * position will cancel the currently playing one. * * @param position The position - * @param recordType The record type + * @param musicDiscType The music disc */ - void playRecord(Vector3i position, RecordType recordType); + void playMusicDisc(Vector3i position, MusicDisc musicDiscType); /** - * Stops the record that is playing at the given position. + * Stops the {@link MusicDisc} that is playing at the given position. * * @param position The position */ - void stopRecord(Vector3i position); + void stopMusicDisc(Vector3i position); /** * Sends a {@link Title} to this player. diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java index 8ace3be8943..05763d781e5 100644 --- a/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java +++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleOptions.java @@ -49,10 +49,10 @@ public final class ParticleOptions { * {@link ParticleType}s that this option is applicable to are: * *
    - *
  • {@link ParticleTypes#BLOCK_CRACK}
    • - *
  • {@link ParticleTypes#BLOCK_DUST}
    • + *
  • {@link ParticleTypes#BLOCK}
    • + *
  • {@link ParticleTypes#FALLING_DUST}
    • *
  • {@link ParticleTypes#BREAK_BLOCK}
    • - *
  • {@link ParticleTypes#ITEM_CRACK}
    • + *
  • {@link ParticleTypes#ITEM}
    • *
*/ public static final ParticleOption BLOCK_STATE = DummyObjectProvider.createFor(ParticleOption.class, "BLOCK_STATE"); @@ -62,9 +62,9 @@ public final class ParticleOptions { * {@link ParticleType}s this option is applicable to are: * *
    - *
  • {@link ParticleTypes#AMBIENT_MOB_SPELL}
    • - *
  • {@link ParticleTypes#MOB_SPELL}
    • - *
  • {@link ParticleTypes#REDSTONE_DUST}
    • + *
  • {@link ParticleTypes#AMBIENT_ENTITY_EFFECT}
    • + *
  • {@link ParticleTypes#ENTITY_EFFECT}
    • + *
  • {@link ParticleTypes#DUST}
    • *
*/ public static final ParticleOption COLOR = DummyObjectProvider.createFor(ParticleOption.class, "COLOR"); @@ -90,10 +90,10 @@ public final class ParticleOptions { * {@link ParticleType} this option is applicable to are: * *
    - *
  • {@link ParticleTypes#BLOCK_CRACK}
    • - *
  • {@link ParticleTypes#BLOCK_DUST}
    • + *
  • {@link ParticleTypes#BLOCK}
    • + *
  • {@link ParticleTypes#FALLING_DUST}
    • *
  • {@link ParticleTypes#BREAK_BLOCK}
    • - *
  • {@link ParticleTypes#ITEM_CRACK}
    • + *
  • {@link ParticleTypes#ITEM}
    • *
*/ public static final ParticleOption ITEM_STACK_SNAPSHOT = @@ -114,10 +114,10 @@ public final class ParticleOptions { /** * This option will change the potion type of a particle. The only vanilla * {@link ParticleType}s this option is applicable to is - * {@link ParticleTypes#SPLASH_POTION}. + * {@link ParticleTypes#BREAK_SPLASH_POTION}. */ - public static final ParticleOption POTION_EFFECT_TYPE = DummyObjectProvider - .createFor(ParticleOption.class, "POTION_EFFECT_TYPE"); + public static final ParticleOption POTION_EFFECT_TYPE = + DummyObjectProvider.createFor(ParticleOption.class, "POTION_EFFECT_TYPE"); /** * This option will affect the amount of particles that are spawned. The @@ -125,12 +125,12 @@ public final class ParticleOptions { * this option isn't applicable to are: * *
    - *
  • {@link ParticleTypes#BREAK_BLOCK}
    • - *
  • {@link ParticleTypes#ENDER_TELEPORT}
    • + *
  • {@link ParticleTypes#BLOCK}
    • + *
  • {@link ParticleTypes#BREAK_EYE_OF_ENDER}
    • *
  • {@link ParticleTypes#FIRE_SMOKE}
    • - *
  • {@link ParticleTypes#FIREWORKS}
    • + *
  • {@link ParticleTypes#FIREWORKS_SPARK}
    • *
  • {@link ParticleTypes#MOBSPAWNER_FLAMES}
    • - *
  • {@link ParticleTypes#SPLASH_POTION}
    • + *
  • {@link ParticleTypes#BREAK_SPLASH_POTION}
    • *
* *

The quantity must be at least 1, or a {@link IllegalArgumentException} @@ -143,8 +143,9 @@ public final class ParticleOptions { * vanilla {@link ParticleType}s this option is applicable to are: * *

    - *
  • {@link ParticleTypes#LARGE_EXPLOSION}
    • + *
  • {@link ParticleTypes#EXPLOSION}
    • *
  • {@link ParticleTypes#SWEEP_ATTACK}
    • + *
  • {@link ParticleTypes#DUST}
    • *
* *

The scale may never be negative, or a {@link IllegalArgumentException} @@ -158,9 +159,9 @@ public final class ParticleOptions { * that this option will affect are: * *

    - *
  • {@link ParticleTypes#SPELL}
    • - *
  • {@link ParticleTypes#INSTANT_SPELL}
    • - *
  • {@link ParticleTypes#WITCH_SPELL}
    • + *
  • {@link ParticleTypes#EFFECT}
    • + *
  • {@link ParticleTypes#INSTANT_EFFECT}
    • + *
  • {@link ParticleTypes#WITCH_MAGIC}
    • *
* *

These particle types don't have a configurable velocity (through diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java index 19ada4082f2..41693b0a974 100644 --- a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java +++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java @@ -24,6 +24,7 @@ */ package org.spongepowered.api.effect.particle; +import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.entity.living.player.Player; import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; @@ -34,15 +35,13 @@ public final class ParticleTypes { // SORTFIELDS:ON - public static final ParticleType AMBIENT_MOB_SPELL = DummyObjectProvider.createFor(ParticleType.class, "AMBIENT_MOB_SPELL"); + public static final ParticleType AMBIENT_ENTITY_EFFECT = DummyObjectProvider.createFor(ParticleType.class, "AMBIENT_ENTITY_EFFECT"); public static final ParticleType ANGRY_VILLAGER = DummyObjectProvider.createFor(ParticleType.class, "ANGRY_VILLAGER"); public static final ParticleType BARRIER = DummyObjectProvider.createFor(ParticleType.class, "BARRIER"); - public static final ParticleType BLOCK_CRACK = DummyObjectProvider.createFor(ParticleType.class, "BLOCK_CRACK"); - - public static final ParticleType BLOCK_DUST = DummyObjectProvider.createFor(ParticleType.class, "BLOCK_DUST"); + public static final ParticleType BLOCK = DummyObjectProvider.createFor(ParticleType.class, "BLOCK"); /** * This particle type will play the effect of a block that @@ -54,34 +53,66 @@ public final class ParticleTypes { */ public static final ParticleType BREAK_BLOCK = DummyObjectProvider.createFor(ParticleType.class, "BREAK_BLOCK"); + public static final ParticleType BREAK_EYE_OF_ENDER = DummyObjectProvider.createFor(ParticleType.class, "BREAK_EYE_OF_ENDER"); + + public static final ParticleType BREAK_SPLASH_POTION = DummyObjectProvider.createFor(ParticleType.class, "BREAK_SPLASH_POTION"); + + public static final ParticleType BUBBLE = DummyObjectProvider.createFor(ParticleType.class, "BUBBLE"); + + public static final ParticleType BUBBLE_COLUMN_UP = DummyObjectProvider.createFor(ParticleType.class, "BUBBLE_COLUMN_UP"); + + public static final ParticleType BUBBLE_POP = DummyObjectProvider.createFor(ParticleType.class, "SQUID_INK"); + public static final ParticleType CLOUD = DummyObjectProvider.createFor(ParticleType.class, "CLOUD"); public static final ParticleType CRITICAL_HIT = DummyObjectProvider.createFor(ParticleType.class, "CRITICAL_HIT"); + public static final ParticleType CURRENT_DOWN = DummyObjectProvider.createFor(ParticleType.class, "CURRENT_DOWN"); + public static final ParticleType DAMAGE_INDICATOR = DummyObjectProvider.createFor(ParticleType.class, "DAMAGE_INDICATOR"); + public static final ParticleType DOLPHIN_SPEED = DummyObjectProvider.createFor(ParticleType.class, "DOLPHIN_SPEED"); + public static final ParticleType DRAGON_BREATH = DummyObjectProvider.createFor(ParticleType.class, "DRAGON_BREATH"); public static final ParticleType DRAGON_BREATH_ATTACK = DummyObjectProvider.createFor(ParticleType.class, "DRAGON_BREATH_ATTACK"); - public static final ParticleType DRIP_LAVA = DummyObjectProvider.createFor(ParticleType.class, "DRIP_LAVA"); + public static final ParticleType DRIPPING_LAVA = DummyObjectProvider.createFor(ParticleType.class, "DRIPPING_LAVA"); - public static final ParticleType DRIP_WATER = DummyObjectProvider.createFor(ParticleType.class, "DRIP_WATER"); + public static final ParticleType DRIPPING_WATER = DummyObjectProvider.createFor(ParticleType.class, "DRIPPING_WATER"); - public static final ParticleType ENCHANTING_GLYPHS = DummyObjectProvider.createFor(ParticleType.class, "ENCHANTING_GLYPHS"); + /** + * While this particle type the option {@link ParticleOptions#SCALE} supports, the maximum value + * that is supported is {@code 4.0} and higher values will be limited to this maximum. + */ + public static final ParticleType DUST = DummyObjectProvider.createFor(ParticleType.class, "DUST"); + + /** + * While this particle type the option {@link ParticleOptions#VELOCITY} supports, this + * will only affect the velocity in the y direction. + */ + public static final ParticleType EFFECT = DummyObjectProvider.createFor(ParticleType.class, "EFFECT"); + + public static final ParticleType ELDER_GUARDIAN = DummyObjectProvider.createFor(ParticleType.class, "ELDER_GUARDIAN"); - public static final ParticleType ENDER_TELEPORT = DummyObjectProvider.createFor(ParticleType.class, "ENDER_TELEPORT"); + public static final ParticleType ENCHANTED_HIT = DummyObjectProvider.createFor(ParticleType.class, "ENCHANTED_HIT"); + + public static final ParticleType ENCHANTING_GLYPHS = DummyObjectProvider.createFor(ParticleType.class, "ENCHANTING_GLYPHS"); public static final ParticleType END_ROD = DummyObjectProvider.createFor(ParticleType.class, "END_ROD"); + public static final ParticleType ENTITY_EFFECT = DummyObjectProvider.createFor(ParticleType.class, "ENTITY_EFFECT"); + public static final ParticleType EXPLOSION = DummyObjectProvider.createFor(ParticleType.class, "EXPLOSION"); + public static final ParticleType EXPLOSION_EMITTER = DummyObjectProvider.createFor(ParticleType.class, "EXPLOSION_EMITTER"); + public static final ParticleType FALLING_DUST = DummyObjectProvider.createFor(ParticleType.class, "FALLING_DUST"); /** * This particle type will play the effect that will occur when - * a {@link Player} uses bone meal on a plant to boost the growth. - * + * a {@link Player} uses bone meal on a plant to boost the growth, + * this can only be played at a block location that isn't {@link BlockTypes#AIR}. *

This type has limited {@link ParticleOption}s, only * {@link ParticleOptions#QUANTITY} is supported.

* @@ -107,81 +138,63 @@ public final class ParticleTypes { */ public static final ParticleType FIRE_SMOKE = DummyObjectProvider.createFor(ParticleType.class, "FIRE_SMOKE"); - public static final ParticleType FLAME = DummyObjectProvider.createFor(ParticleType.class, "FLAME"); - - public static final ParticleType FOOTSTEP = DummyObjectProvider.createFor(ParticleType.class, "FOOTSTEP"); + public static final ParticleType FISHING = DummyObjectProvider.createFor(ParticleType.class, "FISHING"); - public static final ParticleType GUARDIAN_APPEARANCE = DummyObjectProvider.createFor(ParticleType.class, "GUARDIAN_APPEARANCE"); + public static final ParticleType FLAME = DummyObjectProvider.createFor(ParticleType.class, "FLAME"); public static final ParticleType HAPPY_VILLAGER = DummyObjectProvider.createFor(ParticleType.class, "HAPPY_VILLAGER"); public static final ParticleType HEART = DummyObjectProvider.createFor(ParticleType.class, "HEART"); - public static final ParticleType HUGE_EXPLOSION = DummyObjectProvider.createFor(ParticleType.class, "HUGE_EXPLOSION"); - /** * While this particle type the option {@link ParticleOptions#VELOCITY} * supports, this will only affect the velocity in the y direction. */ - public static final ParticleType INSTANT_SPELL = DummyObjectProvider.createFor(ParticleType.class, "INSTANT_SPELL"); + public static final ParticleType INSTANT_EFFECT = DummyObjectProvider.createFor(ParticleType.class, "INSTANT_EFFECT"); - public static final ParticleType ITEM_CRACK = DummyObjectProvider.createFor(ParticleType.class, "ITEM_CRACK"); + public static final ParticleType ITEM = DummyObjectProvider.createFor(ParticleType.class, "ITEM"); - public static final ParticleType LARGE_EXPLOSION = DummyObjectProvider.createFor(ParticleType.class, "LARGE_EXPLOSION"); + public static final ParticleType ITEM_SLIME = DummyObjectProvider.createFor(ParticleType.class, "ITEM_SLIME"); + + public static final ParticleType ITEM_SNOWBALL = DummyObjectProvider.createFor(ParticleType.class, "ITEM_SNOWBALL"); public static final ParticleType LARGE_SMOKE = DummyObjectProvider.createFor(ParticleType.class, "LARGE_SMOKE"); public static final ParticleType LAVA = DummyObjectProvider.createFor(ParticleType.class, "LAVA"); - public static final ParticleType MAGIC_CRITICAL_HIT = DummyObjectProvider.createFor(ParticleType.class, "MAGIC_CRITICAL_HIT"); - public static final ParticleType MOBSPAWNER_FLAMES = DummyObjectProvider.createFor(ParticleType.class, "MOBSPAWNER_FLAMES"); - public static final ParticleType MOB_SPELL = DummyObjectProvider.createFor(ParticleType.class, "MOB_SPELL"); + public static final ParticleType MYCELIUM = DummyObjectProvider.createFor(ParticleType.class, "MYCELIUM"); + + public static final ParticleType NAUTILUS = DummyObjectProvider.createFor(ParticleType.class, "NAUTILUS"); public static final ParticleType NOTE = DummyObjectProvider.createFor(ParticleType.class, "NOTE"); public static final ParticleType PORTAL = DummyObjectProvider.createFor(ParticleType.class, "PORTAL"); - public static final ParticleType REDSTONE_DUST = DummyObjectProvider.createFor(ParticleType.class, "REDSTONE_DUST"); - - public static final ParticleType SLIME = DummyObjectProvider.createFor(ParticleType.class, "SLIME"); + public static final ParticleType RAIN_SPLASH = DummyObjectProvider.createFor(ParticleType.class, "RAIN_SPLASH"); public static final ParticleType SMOKE = DummyObjectProvider.createFor(ParticleType.class, "SMOKE"); - public static final ParticleType SNOWBALL = DummyObjectProvider.createFor(ParticleType.class, "SNOWBALL"); + public static final ParticleType SNOWBALL_POOF = DummyObjectProvider.createFor(ParticleType.class, "SNOWBALL_POOF"); - public static final ParticleType SNOW_SHOVEL = DummyObjectProvider.createFor(ParticleType.class, "SNOW_SHOVEL"); + public static final ParticleType SPIT = DummyObjectProvider.createFor(ParticleType.class, "SPIT"); - /** - * While this particle type the option {@link ParticleOptions#VELOCITY} - * supports, this will only affect the velocity in the y direction. - */ - public static final ParticleType SPELL = DummyObjectProvider.createFor(ParticleType.class, "SPELL"); - - public static final ParticleType SPLASH_POTION = DummyObjectProvider.createFor(ParticleType.class, "SPLASH_POTION"); - - public static final ParticleType SUSPENDED = DummyObjectProvider.createFor(ParticleType.class, "SUSPENDED"); - - public static final ParticleType SUSPENDED_DEPTH = DummyObjectProvider.createFor(ParticleType.class, "SUSPENDED_DEPTH"); + public static final ParticleType SQUID_INK = DummyObjectProvider.createFor(ParticleType.class, "SQUID_INK"); public static final ParticleType SWEEP_ATTACK = DummyObjectProvider.createFor(ParticleType.class, "SWEEP_ATTACK"); - public static final ParticleType TOWN_AURA = DummyObjectProvider.createFor(ParticleType.class, "TOWN_AURA"); + public static final ParticleType TOTEM_OF_UNDYING = DummyObjectProvider.createFor(ParticleType.class, "TOTEM_OF_UNDYING"); - public static final ParticleType WATER_BUBBLE = DummyObjectProvider.createFor(ParticleType.class, "WATER_BUBBLE"); - - public static final ParticleType WATER_DROP = DummyObjectProvider.createFor(ParticleType.class, "WATER_DROP"); + public static final ParticleType UNDERWATER = DummyObjectProvider.createFor(ParticleType.class, "UNDERWATER"); public static final ParticleType WATER_SPLASH = DummyObjectProvider.createFor(ParticleType.class, "WATER_SPLASH"); - public static final ParticleType WATER_WAKE = DummyObjectProvider.createFor(ParticleType.class, "WATER_WAKE"); - /** * While this particle type the option {@link ParticleOptions#VELOCITY} * supports, this will only affect the velocity in the y direction. */ - public static final ParticleType WITCH_SPELL = DummyObjectProvider.createFor(ParticleType.class, "WITCH_SPELL"); + public static final ParticleType WITCH_MAGIC = DummyObjectProvider.createFor(ParticleType.class, "WITCH_MAGIC"); // SORTFIELDS:OFF diff --git a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java index 2ab19238fe1..c675416e920 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java @@ -35,6 +35,18 @@ public final class SoundTypes { public static final SoundType AMBIENT_CAVE = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_CAVE"); + public static final SoundType AMBIENT_UNDERWATER_ENTER = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_ENTER"); + + public static final SoundType AMBIENT_UNDERWATER_EXIT = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_EXIT"); + + public static final SoundType AMBIENT_UNDERWATER_LOOP = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_LOOP"); + + public static final SoundType AMBIENT_UNDERWATER_LOOP_ADDITIONS = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_LOOP_ADDITIONS"); + + public static final SoundType AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE"); + + public static final SoundType AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE = DummyObjectProvider.createFor(SoundType.class, "AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE"); + public static final SoundType BLOCK_ANVIL_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ANVIL_BREAK"); public static final SoundType BLOCK_ANVIL_DESTROY = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ANVIL_DESTROY"); @@ -51,8 +63,26 @@ public final class SoundTypes { public static final SoundType BLOCK_ANVIL_USE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ANVIL_USE"); + public static final SoundType BLOCK_BEACON_ACTIVATE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BEACON_ACTIVATE"); + + public static final SoundType BLOCK_BEACON_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BEACON_AMBIENT"); + + public static final SoundType BLOCK_BEACON_DEACTIVATE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BEACON_DEACTIVATE"); + + public static final SoundType BLOCK_BEACON_POWER_SELECT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BEACON_POWER_SELECT"); + public static final SoundType BLOCK_BREWING_STAND_BREW = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BREWING_STAND_BREW"); + public static final SoundType BLOCK_BUBBLE_COLUMN_BUBBLE_POP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BUBBLE_COLUMN_BUBBLE_POP"); + + public static final SoundType BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT"); + + public static final SoundType BLOCK_BUBBLE_COLUMN_UPWARDS_INSIDE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BUBBLE_COLUMN_UPWARDS_INSIDE"); + + public static final SoundType BLOCK_BUBBLE_COLUMN_WHIRLPOOL_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BUBBLE_COLUMN_WHIRLPOOL_AMBIENT"); + + public static final SoundType BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE"); + public static final SoundType BLOCK_CHEST_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CHEST_CLOSE"); public static final SoundType BLOCK_CHEST_LOCKED = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CHEST_LOCKED"); @@ -63,17 +93,27 @@ public final class SoundTypes { public static final SoundType BLOCK_CHORUS_FLOWER_GROW = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CHORUS_FLOWER_GROW"); - public static final SoundType BLOCK_CLOTH_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CLOTH_BREAK"); + public static final SoundType BLOCK_COMPARATOR_CLICK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_COMPARATOR_CLICK"); - public static final SoundType BLOCK_CLOTH_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CLOTH_FALL"); + public static final SoundType BLOCK_CONDUIT_ACTIVATE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CONDUIT_ACTIVATE"); - public static final SoundType BLOCK_CLOTH_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CLOTH_HIT"); + public static final SoundType BLOCK_CONDUIT_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CONDUIT_AMBIENT"); - public static final SoundType BLOCK_CLOTH_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CLOTH_PLACE"); + public static final SoundType BLOCK_CONDUIT_AMBIENT_SHORT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CONDUIT_AMBIENT_SHORT"); - public static final SoundType BLOCK_CLOTH_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CLOTH_STEP"); + public static final SoundType BLOCK_CONDUIT_ATTACK_TARGET = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CONDUIT_ATTACK_TARGET"); - public static final SoundType BLOCK_COMPARATOR_CLICK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_COMPARATOR_CLICK"); + public static final SoundType BLOCK_CONDUIT_DEACTIVATE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CONDUIT_DEACTIVATE"); + + public static final SoundType BLOCK_CORAL_BLOCK_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CORAL_BLOCK_BREAK"); + + public static final SoundType BLOCK_CORAL_BLOCK_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CORAL_BLOCK_FALL"); + + public static final SoundType BLOCK_CORAL_BLOCK_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CORAL_BLOCK_HIT"); + + public static final SoundType BLOCK_CORAL_BLOCK_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CORAL_BLOCK_PLACE"); + + public static final SoundType BLOCK_CORAL_BLOCK_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_CORAL_BLOCK_STEP"); public static final SoundType BLOCK_DISPENSER_DISPENSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_DISPENSER_DISPENSE"); @@ -83,15 +123,15 @@ public final class SoundTypes { public static final SoundType BLOCK_ENCHANTMENT_TABLE_USE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ENCHANTMENT_TABLE_USE"); - public static final SoundType BLOCK_ENDERCHEST_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ENDERCHEST_CLOSE"); - - public static final SoundType BLOCK_ENDERCHEST_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ENDERCHEST_OPEN"); - public static final SoundType BLOCK_END_GATEWAY_SPAWN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_END_GATEWAY_SPAWN"); + public static final SoundType BLOCK_END_PORTAL_SPAWN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_END_PORTAL_SPAWN"); + public static final SoundType BLOCK_END_PORTAL_FRAME_FILL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_END_PORTAL_FRAME_FILL"); - public static final SoundType BLOCK_END_PORTAL_SPAWN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_END_PORTAL_SPAWN"); + public static final SoundType BLOCK_ENDER_CHEST_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ENDER_CHEST_CLOSE"); + + public static final SoundType BLOCK_ENDER_CHEST_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_ENDER_CHEST_OPEN"); public static final SoundType BLOCK_FENCE_GATE_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_FENCE_GATE_CLOSE"); @@ -159,6 +199,8 @@ public final class SoundTypes { public static final SoundType BLOCK_LEVER_CLICK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_LEVER_CLICK"); + public static final SoundType BLOCK_LILY_PAD_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_LILY_PAD_PLACE"); + public static final SoundType BLOCK_METAL_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_BREAK"); public static final SoundType BLOCK_METAL_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_FALL"); @@ -167,35 +209,33 @@ public final class SoundTypes { public static final SoundType BLOCK_METAL_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_PLACE"); - public static final SoundType BLOCK_METAL_PRESSUREPLATE_CLICK_OFF = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_METAL_PRESSUREPLATE_CLICK_OFF"); + public static final SoundType BLOCK_METAL_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_STEP"); - public static final SoundType BLOCK_METAL_PRESSUREPLATE_CLICK_ON = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_METAL_PRESSUREPLATE_CLICK_ON"); + public static final SoundType BLOCK_METAL_PRESSURE_PLATE_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_PRESSURE_PLATE_CLICK_OFF"); - public static final SoundType BLOCK_METAL_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_STEP"); + public static final SoundType BLOCK_METAL_PRESSURE_PLATE_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_METAL_PRESSURE_PLATE_CLICK_ON"); - public static final SoundType BLOCK_NOTE_BASEDRUM = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BASEDRUM"); + public static final SoundType BLOCK_NOTE_BLOCK_BASEDRUM = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_BASEDRUM"); - public static final SoundType BLOCK_NOTE_BASS = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BASS"); + public static final SoundType BLOCK_NOTE_BLOCK_BASS = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_BASS"); - public static final SoundType BLOCK_NOTE_BELL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BELL"); + public static final SoundType BLOCK_NOTE_BLOCK_BELL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_BELL"); - public static final SoundType BLOCK_NOTE_CHIME = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_CHIME"); + public static final SoundType BLOCK_NOTE_BLOCK_CHIME = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_CHIME"); - public static final SoundType BLOCK_NOTE_FLUTE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_FLUTE"); + public static final SoundType BLOCK_NOTE_BLOCK_FLUTE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_FLUTE"); - public static final SoundType BLOCK_NOTE_GUITAR = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_GUITAR"); + public static final SoundType BLOCK_NOTE_BLOCK_GUITAR = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_GUITAR"); - public static final SoundType BLOCK_NOTE_HARP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_HARP"); + public static final SoundType BLOCK_NOTE_BLOCK_HARP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_HARP"); - public static final SoundType BLOCK_NOTE_HAT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_HAT"); + public static final SoundType BLOCK_NOTE_BLOCK_HAT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_HAT"); - public static final SoundType BLOCK_NOTE_PLING = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_PLING"); + public static final SoundType BLOCK_NOTE_BLOCK_PLING = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_PLING"); - public static final SoundType BLOCK_NOTE_SNARE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_SNARE"); + public static final SoundType BLOCK_NOTE_BLOCK_SNARE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_SNARE"); - public static final SoundType BLOCK_NOTE_XYLOPHONE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_XYLOPHONE"); + public static final SoundType BLOCK_NOTE_BLOCK_XYLOPHONE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_NOTE_BLOCK_XYLOPHONE"); public static final SoundType BLOCK_PISTON_CONTRACT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_PISTON_CONTRACT"); @@ -207,6 +247,8 @@ public final class SoundTypes { public static final SoundType BLOCK_PORTAL_TRIGGER = DummyObjectProvider.createFor(SoundType.class, "BLOCK_PORTAL_TRIGGER"); + public static final SoundType BLOCK_PUMPKIN_CARVE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_PUMPKIN_CARVE"); + public static final SoundType BLOCK_REDSTONE_TORCH_BURNOUT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_REDSTONE_TORCH_BURNOUT"); public static final SoundType BLOCK_SAND_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SAND_BREAK"); @@ -223,15 +265,15 @@ public final class SoundTypes { public static final SoundType BLOCK_SHULKER_BOX_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SHULKER_BOX_OPEN"); - public static final SoundType BLOCK_SLIME_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BREAK"); + public static final SoundType BLOCK_SLIME_BLOCK_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BLOCK_BREAK"); - public static final SoundType BLOCK_SLIME_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_FALL"); + public static final SoundType BLOCK_SLIME_BLOCK_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BLOCK_FALL"); - public static final SoundType BLOCK_SLIME_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_HIT"); + public static final SoundType BLOCK_SLIME_BLOCK_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BLOCK_HIT"); - public static final SoundType BLOCK_SLIME_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_PLACE"); + public static final SoundType BLOCK_SLIME_BLOCK_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BLOCK_PLACE"); - public static final SoundType BLOCK_SLIME_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_STEP"); + public static final SoundType BLOCK_SLIME_BLOCK_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SLIME_BLOCK_STEP"); public static final SoundType BLOCK_SNOW_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_SNOW_BREAK"); @@ -245,23 +287,21 @@ public final class SoundTypes { public static final SoundType BLOCK_STONE_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_BREAK"); - public static final SoundType BLOCK_STONE_BUTTON_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_BUTTON_CLICK_OFF"); - - public static final SoundType BLOCK_STONE_BUTTON_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_BUTTON_CLICK_ON"); - public static final SoundType BLOCK_STONE_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_FALL"); public static final SoundType BLOCK_STONE_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_HIT"); public static final SoundType BLOCK_STONE_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_PLACE"); - public static final SoundType BLOCK_STONE_PRESSUREPLATE_CLICK_OFF = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_STONE_PRESSUREPLATE_CLICK_OFF"); + public static final SoundType BLOCK_STONE_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_STEP"); - public static final SoundType BLOCK_STONE_PRESSUREPLATE_CLICK_ON = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_STONE_PRESSUREPLATE_CLICK_ON"); + public static final SoundType BLOCK_STONE_BUTTON_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_BUTTON_CLICK_OFF"); - public static final SoundType BLOCK_STONE_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_STEP"); + public static final SoundType BLOCK_STONE_BUTTON_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_BUTTON_CLICK_ON"); + + public static final SoundType BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF"); + + public static final SoundType BLOCK_STONE_PRESSURE_PLATE_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_STONE_PRESSURE_PLATE_CLICK_ON"); public static final SoundType BLOCK_TRIPWIRE_ATTACH = DummyObjectProvider.createFor(SoundType.class, "BLOCK_TRIPWIRE_ATTACH"); @@ -271,23 +311,19 @@ public final class SoundTypes { public static final SoundType BLOCK_TRIPWIRE_DETACH = DummyObjectProvider.createFor(SoundType.class, "BLOCK_TRIPWIRE_DETACH"); - public static final SoundType BLOCK_WATERLILY_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WATERLILY_PLACE"); - public static final SoundType BLOCK_WATER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WATER_AMBIENT"); - public static final SoundType BLOCK_WOODEN_DOOR_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_DOOR_CLOSE"); - - public static final SoundType BLOCK_WOODEN_DOOR_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_DOOR_OPEN"); + public static final SoundType BLOCK_WET_GRASS_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WET_GRASS_BREAK"); - public static final SoundType BLOCK_WOODEN_TRAPDOOR_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_TRAPDOOR_CLOSE"); + public static final SoundType BLOCK_WET_GRASS_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WET_GRASS_FALL"); - public static final SoundType BLOCK_WOODEN_TRAPDOOR_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_TRAPDOOR_OPEN"); + public static final SoundType BLOCK_WET_GRASS_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WET_GRASS_HIT"); - public static final SoundType BLOCK_WOOD_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_BREAK"); + public static final SoundType BLOCK_WET_GRASS_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WET_GRASS_PLACE"); - public static final SoundType BLOCK_WOOD_BUTTON_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_BUTTON_CLICK_OFF"); + public static final SoundType BLOCK_WET_GRASS_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WET_GRASS_STEP"); - public static final SoundType BLOCK_WOOD_BUTTON_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_BUTTON_CLICK_ON"); + public static final SoundType BLOCK_WOOD_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_BREAK"); public static final SoundType BLOCK_WOOD_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_FALL"); @@ -295,23 +331,43 @@ public final class SoundTypes { public static final SoundType BLOCK_WOOD_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_PLACE"); - public static final SoundType BLOCK_WOOD_PRESSUREPLATE_CLICK_OFF = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_WOOD_PRESSUREPLATE_CLICK_OFF"); + public static final SoundType BLOCK_WOOD_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_STEP"); + + public static final SoundType BLOCK_WOODEN_BUTTON_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_BUTTON_CLICK_OFF"); - public static final SoundType BLOCK_WOOD_PRESSUREPLATE_CLICK_ON = DummyObjectProvider - .createFor(SoundType.class, "BLOCK_WOOD_PRESSUREPLATE_CLICK_ON"); + public static final SoundType BLOCK_WOODEN_BUTTON_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_BUTTON_CLICK_ON"); - public static final SoundType BLOCK_WOOD_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOD_STEP"); + public static final SoundType BLOCK_WOODEN_DOOR_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_DOOR_CLOSE"); + + public static final SoundType BLOCK_WOODEN_DOOR_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_DOOR_OPEN"); + + public static final SoundType BLOCK_WOODEN_PRESSURE_PLATE_CLICK_OFF = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_PRESSURE_PLATE_CLICK_OFF"); + + public static final SoundType BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON"); + + public static final SoundType BLOCK_WOODEN_TRAPDOOR_CLOSE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_TRAPDOOR_CLOSE"); + + public static final SoundType BLOCK_WOODEN_TRAPDOOR_OPEN = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOODEN_TRAPDOOR_OPEN"); + + public static final SoundType BLOCK_WOOL_BREAK = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOL_BREAK"); + + public static final SoundType BLOCK_WOOL_FALL = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOL_FALL"); + + public static final SoundType BLOCK_WOOL_HIT = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOL_HIT"); + + public static final SoundType BLOCK_WOOL_PLACE = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOL_PLACE"); + + public static final SoundType BLOCK_WOOL_STEP = DummyObjectProvider.createFor(SoundType.class, "BLOCK_WOOL_STEP"); public static final SoundType ENCHANT_THORNS_HIT = DummyObjectProvider.createFor(SoundType.class, "ENCHANT_THORNS_HIT"); - public static final SoundType ENTITY_ARMORSTAND_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMORSTAND_BREAK"); + public static final SoundType ENTITY_ARMOR_STAND_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMOR_STAND_BREAK"); - public static final SoundType ENTITY_ARMORSTAND_FALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMORSTAND_FALL"); + public static final SoundType ENTITY_ARMOR_STAND_FALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMOR_STAND_FALL"); - public static final SoundType ENTITY_ARMORSTAND_HIT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMORSTAND_HIT"); + public static final SoundType ENTITY_ARMOR_STAND_HIT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMOR_STAND_HIT"); - public static final SoundType ENTITY_ARMORSTAND_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMORSTAND_PLACE"); + public static final SoundType ENTITY_ARMOR_STAND_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARMOR_STAND_PLACE"); public static final SoundType ENTITY_ARROW_HIT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ARROW_HIT"); @@ -343,12 +399,6 @@ public final class SoundTypes { public static final SoundType ENTITY_BOAT_PADDLE_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_BOAT_PADDLE_WATER"); - public static final SoundType ENTITY_BOBBER_RETRIEVE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_BOBBER_RETRIEVE"); - - public static final SoundType ENTITY_BOBBER_SPLASH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_BOBBER_SPLASH"); - - public static final SoundType ENTITY_BOBBER_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_BOBBER_THROW"); - public static final SoundType ENTITY_CAT_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_CAT_AMBIENT"); public static final SoundType ENTITY_CAT_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_CAT_DEATH"); @@ -371,6 +421,14 @@ public final class SoundTypes { public static final SoundType ENTITY_CHICKEN_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_CHICKEN_STEP"); + public static final SoundType ENTITY_COD_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COD_AMBIENT"); + + public static final SoundType ENTITY_COD_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COD_DEATH"); + + public static final SoundType ENTITY_COD_FLOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COD_FLOP"); + + public static final SoundType ENTITY_COD_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COD_HURT"); + public static final SoundType ENTITY_COW_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COW_AMBIENT"); public static final SoundType ENTITY_COW_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_COW_DEATH"); @@ -387,6 +445,26 @@ public final class SoundTypes { public static final SoundType ENTITY_CREEPER_PRIMED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_CREEPER_PRIMED"); + public static final SoundType ENTITY_DOLPHIN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_AMBIENT"); + + public static final SoundType ENTITY_DOLPHIN_AMBIENT_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_AMBIENT_WATER"); + + public static final SoundType ENTITY_DOLPHIN_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_ATTACK"); + + public static final SoundType ENTITY_DOLPHIN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_DEATH"); + + public static final SoundType ENTITY_DOLPHIN_EAT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_EAT"); + + public static final SoundType ENTITY_DOLPHIN_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_HURT"); + + public static final SoundType ENTITY_DOLPHIN_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_JUMP"); + + public static final SoundType ENTITY_DOLPHIN_PLAY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_PLAY"); + + public static final SoundType ENTITY_DOLPHIN_SPLASH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_SPLASH"); + + public static final SoundType ENTITY_DOLPHIN_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DOLPHIN_SWIM"); + public static final SoundType ENTITY_DONKEY_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DONKEY_AMBIENT"); public static final SoundType ENTITY_DONKEY_ANGRY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DONKEY_ANGRY"); @@ -397,19 +475,37 @@ public final class SoundTypes { public static final SoundType ENTITY_DONKEY_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DONKEY_HURT"); + public static final SoundType ENTITY_DRAGON_FIREBALL_EXPLODE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DRAGON_FIREBALL_EXPLODE"); + + public static final SoundType ENTITY_DROWNED_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_AMBIENT"); + + public static final SoundType ENTITY_DROWNED_AMBIENT_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_AMBIENT_WATER"); + + public static final SoundType ENTITY_DROWNED_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_DEATH"); + + public static final SoundType ENTITY_DROWNED_DEATH_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_DEATH_WATER"); + + public static final SoundType ENTITY_DROWNED_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_HURT"); + + public static final SoundType ENTITY_DROWNED_HURT_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_HURT_WATER"); + + public static final SoundType ENTITY_DROWNED_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_SHOOT"); + + public static final SoundType ENTITY_DROWNED_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_STEP"); + + public static final SoundType ENTITY_DROWNED_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_DROWNED_SWIM"); + public static final SoundType ENTITY_EGG_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EGG_THROW"); public static final SoundType ENTITY_ELDER_GUARDIAN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_AMBIENT"); - public static final SoundType ENTITY_ELDER_GUARDIAN_AMBIENT_LAND = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_AMBIENT_LAND"); + public static final SoundType ENTITY_ELDER_GUARDIAN_AMBIENT_LAND = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_AMBIENT_LAND"); public static final SoundType ENTITY_ELDER_GUARDIAN_CURSE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_CURSE"); public static final SoundType ENTITY_ELDER_GUARDIAN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_DEATH"); - public static final SoundType ENTITY_ELDER_GUARDIAN_DEATH_LAND = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_DEATH_LAND"); + public static final SoundType ENTITY_ELDER_GUARDIAN_DEATH_LAND = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_DEATH_LAND"); public static final SoundType ENTITY_ELDER_GUARDIAN_FLOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_FLOP"); @@ -417,36 +513,35 @@ public final class SoundTypes { public static final SoundType ENTITY_ELDER_GUARDIAN_HURT_LAND = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ELDER_GUARDIAN_HURT_LAND"); - public static final SoundType ENTITY_ENDERDRAGON_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_AMBIENT"); + public static final SoundType ENTITY_ENDER_DRAGON_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_AMBIENT"); - public static final SoundType ENTITY_ENDERDRAGON_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_DEATH"); + public static final SoundType ENTITY_ENDER_DRAGON_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_DEATH"); - public static final SoundType ENTITY_ENDERDRAGON_FIREBALL_EXPLODE = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_ENDERDRAGON_FIREBALL_EXPLODE"); + public static final SoundType ENTITY_ENDER_DRAGON_FLAP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_FLAP"); - public static final SoundType ENTITY_ENDERDRAGON_FLAP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_FLAP"); + public static final SoundType ENTITY_ENDER_DRAGON_GROWL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_GROWL"); - public static final SoundType ENTITY_ENDERDRAGON_GROWL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_GROWL"); + public static final SoundType ENTITY_ENDER_DRAGON_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_HURT"); - public static final SoundType ENTITY_ENDERDRAGON_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_HURT"); + public static final SoundType ENTITY_ENDER_DRAGON_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_DRAGON_SHOOT"); - public static final SoundType ENTITY_ENDERDRAGON_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERDRAGON_SHOOT"); + public static final SoundType ENTITY_ENDER_EYE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_EYE_DEATH"); - public static final SoundType ENTITY_ENDEREYE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDEREYE_DEATH"); + public static final SoundType ENTITY_ENDER_EYE_LAUNCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_EYE_LAUNCH"); - public static final SoundType ENTITY_ENDEREYE_LAUNCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDEREYE_LAUNCH"); + public static final SoundType ENTITY_ENDER_PEARL_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDER_PEARL_THROW"); - public static final SoundType ENTITY_ENDERMEN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_AMBIENT"); + public static final SoundType ENTITY_ENDERMAN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_AMBIENT"); - public static final SoundType ENTITY_ENDERMEN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_DEATH"); + public static final SoundType ENTITY_ENDERMAN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_DEATH"); - public static final SoundType ENTITY_ENDERMEN_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_HURT"); + public static final SoundType ENTITY_ENDERMAN_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_HURT"); - public static final SoundType ENTITY_ENDERMEN_SCREAM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_SCREAM"); + public static final SoundType ENTITY_ENDERMAN_SCREAM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_SCREAM"); - public static final SoundType ENTITY_ENDERMEN_STARE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_STARE"); + public static final SoundType ENTITY_ENDERMAN_STARE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_STARE"); - public static final SoundType ENTITY_ENDERMEN_TELEPORT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMEN_TELEPORT"); + public static final SoundType ENTITY_ENDERMAN_TELEPORT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMAN_TELEPORT"); public static final SoundType ENTITY_ENDERMITE_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMITE_AMBIENT"); @@ -456,48 +551,49 @@ public final class SoundTypes { public static final SoundType ENTITY_ENDERMITE_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERMITE_STEP"); - public static final SoundType ENTITY_ENDERPEARL_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ENDERPEARL_THROW"); - - public static final SoundType ENTITY_EVOCATION_FANGS_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOCATION_FANGS_ATTACK"); + public static final SoundType ENTITY_EVOKER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_AMBIENT"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_AMBIENT = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_AMBIENT"); + public static final SoundType ENTITY_EVOKER_CAST_SPELL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_CAST_SPELL"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_CAST_SPELL = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_CAST_SPELL"); + public static final SoundType ENTITY_EVOKER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_DEATH"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_DEATH"); + public static final SoundType ENTITY_EVOKER_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_HURT"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_HURT"); + public static final SoundType ENTITY_EVOKER_PREPARE_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_PREPARE_ATTACK"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_PREPARE_ATTACK = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_PREPARE_ATTACK"); + public static final SoundType ENTITY_EVOKER_PREPARE_SUMMON = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_PREPARE_SUMMON"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_PREPARE_SUMMON = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_PREPARE_SUMMON"); + public static final SoundType ENTITY_EVOKER_PREPARE_WOLOLO = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_PREPARE_WOLOLO"); - public static final SoundType ENTITY_EVOCATION_ILLAGER_PREPARE_WOLOLO = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_EVOCATION_ILLAGER_PREPARE_WOLOLO"); + public static final SoundType ENTITY_EVOKER_FANGS_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EVOKER_FANGS_ATTACK"); public static final SoundType ENTITY_EXPERIENCE_BOTTLE_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EXPERIENCE_BOTTLE_THROW"); public static final SoundType ENTITY_EXPERIENCE_ORB_PICKUP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_EXPERIENCE_ORB_PICKUP"); - public static final SoundType ENTITY_FIREWORK_BLAST = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_BLAST"); + public static final SoundType ENTITY_FIREWORK_ROCKET_BLAST = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_BLAST"); + + public static final SoundType ENTITY_FIREWORK_ROCKET_BLAST_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_BLAST_FAR"); - public static final SoundType ENTITY_FIREWORK_BLAST_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_BLAST_FAR"); + public static final SoundType ENTITY_FIREWORK_ROCKET_LARGE_BLAST = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_LARGE_BLAST"); - public static final SoundType ENTITY_FIREWORK_LARGE_BLAST = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_LARGE_BLAST"); + public static final SoundType ENTITY_FIREWORK_ROCKET_LARGE_BLAST_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_LARGE_BLAST_FAR"); - public static final SoundType ENTITY_FIREWORK_LARGE_BLAST_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_LARGE_BLAST_FAR"); + public static final SoundType ENTITY_FIREWORK_ROCKET_LAUNCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_LAUNCH"); - public static final SoundType ENTITY_FIREWORK_LAUNCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_LAUNCH"); + public static final SoundType ENTITY_FIREWORK_ROCKET_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_SHOOT"); - public static final SoundType ENTITY_FIREWORK_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_SHOOT"); + public static final SoundType ENTITY_FIREWORK_ROCKET_TWINKLE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_TWINKLE"); - public static final SoundType ENTITY_FIREWORK_TWINKLE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_TWINKLE"); + public static final SoundType ENTITY_FIREWORK_ROCKET_TWINKLE_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_ROCKET_TWINKLE_FAR"); - public static final SoundType ENTITY_FIREWORK_TWINKLE_FAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FIREWORK_TWINKLE_FAR"); + public static final SoundType ENTITY_FISH_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FISH_SWIM"); + + public static final SoundType ENTITY_FISHING_BOBBER_RETRIEVE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FISHING_BOBBER_RETRIEVE"); + + public static final SoundType ENTITY_FISHING_BOBBER_SPLASH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FISHING_BOBBER_SPLASH"); + + public static final SoundType ENTITY_FISHING_BOBBER_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_FISHING_BOBBER_THROW"); public static final SoundType ENTITY_GENERIC_BIG_FALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_GENERIC_BIG_FALL"); @@ -589,57 +685,59 @@ public final class SoundTypes { public static final SoundType ENTITY_HUSK_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_HUSK_AMBIENT"); + public static final SoundType ENTITY_HUSK_CONVERTED_TO_ZOMBIE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_HUSK_CONVERTED_TO_ZOMBIE"); + public static final SoundType ENTITY_HUSK_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_HUSK_DEATH"); public static final SoundType ENTITY_HUSK_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_HUSK_HURT"); public static final SoundType ENTITY_HUSK_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_HUSK_STEP"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_AMBIENT"); + public static final SoundType ENTITY_ILLUSIONER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_AMBIENT"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_CAST_SPELL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_CAST_SPELL"); + public static final SoundType ENTITY_ILLUSIONER_CAST_SPELL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_CAST_SPELL"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_DEATH"); + public static final SoundType ENTITY_ILLUSIONER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_DEATH"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_HURT"); + public static final SoundType ENTITY_ILLUSIONER_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_HURT"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_MIRROR_MOVE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_MIRROR_MOVE"); + public static final SoundType ENTITY_ILLUSIONER_MIRROR_MOVE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_MIRROR_MOVE"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_PREPARE_BLINDNESS = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_PREPARE_BLINDNESS"); + public static final SoundType ENTITY_ILLUSIONER_PREPARE_BLINDNESS = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_PREPARE_BLINDNESS"); - public static final SoundType ENTITY_ILLUSION_ILLAGER_PREPARE_MIRROR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSION_ILLAGER_PREPARE_MIRROR"); + public static final SoundType ENTITY_ILLUSIONER_PREPARE_MIRROR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ILLUSIONER_PREPARE_MIRROR"); - public static final SoundType ENTITY_IRONGOLEM_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRONGOLEM_ATTACK"); + public static final SoundType ENTITY_IRON_GOLEM_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRON_GOLEM_ATTACK"); - public static final SoundType ENTITY_IRONGOLEM_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRONGOLEM_DEATH"); + public static final SoundType ENTITY_IRON_GOLEM_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRON_GOLEM_DEATH"); - public static final SoundType ENTITY_IRONGOLEM_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRONGOLEM_HURT"); + public static final SoundType ENTITY_IRON_GOLEM_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRON_GOLEM_HURT"); - public static final SoundType ENTITY_IRONGOLEM_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRONGOLEM_STEP"); + public static final SoundType ENTITY_IRON_GOLEM_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_IRON_GOLEM_STEP"); - public static final SoundType ENTITY_ITEMFRAME_ADD_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEMFRAME_ADD_ITEM"); + public static final SoundType ENTITY_ITEM_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_BREAK"); - public static final SoundType ENTITY_ITEMFRAME_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEMFRAME_BREAK"); + public static final SoundType ENTITY_ITEM_PICKUP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_PICKUP"); - public static final SoundType ENTITY_ITEMFRAME_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEMFRAME_PLACE"); + public static final SoundType ENTITY_ITEM_FRAME_ADD_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_FRAME_ADD_ITEM"); - public static final SoundType ENTITY_ITEMFRAME_REMOVE_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEMFRAME_REMOVE_ITEM"); + public static final SoundType ENTITY_ITEM_FRAME_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_FRAME_BREAK"); - public static final SoundType ENTITY_ITEMFRAME_ROTATE_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEMFRAME_ROTATE_ITEM"); + public static final SoundType ENTITY_ITEM_FRAME_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_FRAME_PLACE"); - public static final SoundType ENTITY_ITEM_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_BREAK"); + public static final SoundType ENTITY_ITEM_FRAME_REMOVE_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_FRAME_REMOVE_ITEM"); - public static final SoundType ENTITY_ITEM_PICKUP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_PICKUP"); + public static final SoundType ENTITY_ITEM_FRAME_ROTATE_ITEM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ITEM_FRAME_ROTATE_ITEM"); - public static final SoundType ENTITY_LEASHKNOT_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LEASHKNOT_BREAK"); + public static final SoundType ENTITY_LEASH_KNOT_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LEASH_KNOT_BREAK"); - public static final SoundType ENTITY_LEASHKNOT_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LEASHKNOT_PLACE"); + public static final SoundType ENTITY_LEASH_KNOT_PLACE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LEASH_KNOT_PLACE"); - public static final SoundType ENTITY_LIGHTNING_IMPACT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LIGHTNING_IMPACT"); + public static final SoundType ENTITY_LIGHTNING_BOLT_IMPACT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LIGHTNING_BOLT_IMPACT"); - public static final SoundType ENTITY_LIGHTNING_THUNDER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LIGHTNING_THUNDER"); + public static final SoundType ENTITY_LIGHTNING_BOLT_THUNDER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LIGHTNING_BOLT_THUNDER"); - public static final SoundType ENTITY_LINGERINGPOTION_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LINGERINGPOTION_THROW"); + public static final SoundType ENTITY_LINGERING_POTION_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LINGERING_POTION_THROW"); public static final SoundType ENTITY_LLAMA_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LLAMA_AMBIENT"); @@ -659,13 +757,19 @@ public final class SoundTypes { public static final SoundType ENTITY_LLAMA_SWAG = DummyObjectProvider.createFor(SoundType.class, "ENTITY_LLAMA_SWAG"); - public static final SoundType ENTITY_MAGMACUBE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMACUBE_DEATH"); + public static final SoundType ENTITY_MAGMA_CUBE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_DEATH"); + + public static final SoundType ENTITY_MAGMA_CUBE_DEATH_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_DEATH_SMALL"); + + public static final SoundType ENTITY_MAGMA_CUBE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_HURT"); - public static final SoundType ENTITY_MAGMACUBE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMACUBE_HURT"); + public static final SoundType ENTITY_MAGMA_CUBE_HURT_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_HURT_SMALL"); - public static final SoundType ENTITY_MAGMACUBE_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMACUBE_JUMP"); + public static final SoundType ENTITY_MAGMA_CUBE_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_JUMP"); - public static final SoundType ENTITY_MAGMACUBE_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMACUBE_SQUISH"); + public static final SoundType ENTITY_MAGMA_CUBE_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_SQUISH"); + + public static final SoundType ENTITY_MAGMA_CUBE_SQUISH_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MAGMA_CUBE_SQUISH_SMALL"); public static final SoundType ENTITY_MINECART_INSIDE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_MINECART_INSIDE"); @@ -699,23 +803,27 @@ public final class SoundTypes { public static final SoundType ENTITY_PARROT_IMITATE_CREEPER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_CREEPER"); + public static final SoundType ENTITY_PARROT_IMITATE_DROWNED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_DROWNED"); + public static final SoundType ENTITY_PARROT_IMITATE_ELDER_GUARDIAN = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ELDER_GUARDIAN"); - public static final SoundType ENTITY_PARROT_IMITATE_ENDERDRAGON = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ENDERDRAGON"); + public static final SoundType ENTITY_PARROT_IMITATE_ENDER_DRAGON = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ENDER_DRAGON"); public static final SoundType ENTITY_PARROT_IMITATE_ENDERMAN = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ENDERMAN"); public static final SoundType ENTITY_PARROT_IMITATE_ENDERMITE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ENDERMITE"); - public static final SoundType ENTITY_PARROT_IMITATE_EVOCATION_ILLAGER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_EVOCATION_ILLAGER"); + public static final SoundType ENTITY_PARROT_IMITATE_EVOKER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_EVOKER"); public static final SoundType ENTITY_PARROT_IMITATE_GHAST = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_GHAST"); public static final SoundType ENTITY_PARROT_IMITATE_HUSK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_HUSK"); - public static final SoundType ENTITY_PARROT_IMITATE_ILLUSION_ILLAGER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ILLUSION_ILLAGER"); + public static final SoundType ENTITY_PARROT_IMITATE_ILLUSIONER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_ILLUSIONER"); + + public static final SoundType ENTITY_PARROT_IMITATE_MAGMA_CUBE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_MAGMA_CUBE"); - public static final SoundType ENTITY_PARROT_IMITATE_MAGMACUBE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_MAGMACUBE"); + public static final SoundType ENTITY_PARROT_IMITATE_PHANTOM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_PHANTOM"); public static final SoundType ENTITY_PARROT_IMITATE_POLAR_BEAR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_POLAR_BEAR"); @@ -733,7 +841,7 @@ public final class SoundTypes { public static final SoundType ENTITY_PARROT_IMITATE_VEX = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_VEX"); - public static final SoundType ENTITY_PARROT_IMITATE_VINDICATION_ILLAGER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_VINDICATION_ILLAGER"); + public static final SoundType ENTITY_PARROT_IMITATE_VINDICATOR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_VINDICATOR"); public static final SoundType ENTITY_PARROT_IMITATE_WITCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_IMITATE_WITCH"); @@ -751,6 +859,18 @@ public final class SoundTypes { public static final SoundType ENTITY_PARROT_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PARROT_STEP"); + public static final SoundType ENTITY_PHANTOM_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_AMBIENT"); + + public static final SoundType ENTITY_PHANTOM_BITE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_BITE"); + + public static final SoundType ENTITY_PHANTOM_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_DEATH"); + + public static final SoundType ENTITY_PHANTOM_FLAP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_FLAP"); + + public static final SoundType ENTITY_PHANTOM_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_HURT"); + + public static final SoundType ENTITY_PHANTOM_SWOOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PHANTOM_SWOOP"); + public static final SoundType ENTITY_PIG_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PIG_AMBIENT"); public static final SoundType ENTITY_PIG_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PIG_DEATH"); @@ -793,11 +913,13 @@ public final class SoundTypes { public static final SoundType ENTITY_PLAYER_SPLASH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PLAYER_SPLASH"); + public static final SoundType ENTITY_PLAYER_SPLASH_HIGH_SPEED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PLAYER_SPLASH_HIGH_SPEED"); + public static final SoundType ENTITY_PLAYER_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PLAYER_SWIM"); public static final SoundType ENTITY_POLAR_BEAR_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_POLAR_BEAR_AMBIENT"); - public static final SoundType ENTITY_POLAR_BEAR_BABY_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_POLAR_BEAR_BABY_AMBIENT"); + public static final SoundType ENTITY_POLAR_BEAR_AMBIENT_BABY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_POLAR_BEAR_AMBIENT_BABY"); public static final SoundType ENTITY_POLAR_BEAR_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_POLAR_BEAR_DEATH"); @@ -807,6 +929,20 @@ public final class SoundTypes { public static final SoundType ENTITY_POLAR_BEAR_WARNING = DummyObjectProvider.createFor(SoundType.class, "ENTITY_POLAR_BEAR_WARNING"); + public static final SoundType ENTITY_PUFFER_FISH_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_AMBIENT"); + + public static final SoundType ENTITY_PUFFER_FISH_BLOW_OUT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_BLOW_OUT"); + + public static final SoundType ENTITY_PUFFER_FISH_BLOW_UP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_BLOW_UP"); + + public static final SoundType ENTITY_PUFFER_FISH_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_DEATH"); + + public static final SoundType ENTITY_PUFFER_FISH_FLOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_FLOP"); + + public static final SoundType ENTITY_PUFFER_FISH_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_HURT"); + + public static final SoundType ENTITY_PUFFER_FISH_STING = DummyObjectProvider.createFor(SoundType.class, "ENTITY_PUFFER_FISH_STING"); + public static final SoundType ENTITY_RABBIT_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_RABBIT_AMBIENT"); public static final SoundType ENTITY_RABBIT_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_RABBIT_ATTACK"); @@ -817,6 +953,14 @@ public final class SoundTypes { public static final SoundType ENTITY_RABBIT_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_RABBIT_JUMP"); + public static final SoundType ENTITY_SALMON_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SALMON_AMBIENT"); + + public static final SoundType ENTITY_SALMON_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SALMON_DEATH"); + + public static final SoundType ENTITY_SALMON_FLOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SALMON_FLOP"); + + public static final SoundType ENTITY_SALMON_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SALMON_HURT"); + public static final SoundType ENTITY_SHEEP_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHEEP_AMBIENT"); public static final SoundType ENTITY_SHEEP_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHEEP_DEATH"); @@ -829,10 +973,6 @@ public final class SoundTypes { public static final SoundType ENTITY_SHULKER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_AMBIENT"); - public static final SoundType ENTITY_SHULKER_BULLET_HIT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_BULLET_HIT"); - - public static final SoundType ENTITY_SHULKER_BULLET_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_BULLET_HURT"); - public static final SoundType ENTITY_SHULKER_CLOSE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_CLOSE"); public static final SoundType ENTITY_SHULKER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_DEATH"); @@ -847,6 +987,10 @@ public final class SoundTypes { public static final SoundType ENTITY_SHULKER_TELEPORT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_TELEPORT"); + public static final SoundType ENTITY_SHULKER_BULLET_HIT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_BULLET_HIT"); + + public static final SoundType ENTITY_SHULKER_BULLET_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SHULKER_BULLET_HURT"); + public static final SoundType ENTITY_SILVERFISH_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SILVERFISH_AMBIENT"); public static final SoundType ENTITY_SILVERFISH_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SILVERFISH_DEATH"); @@ -859,52 +1003,56 @@ public final class SoundTypes { public static final SoundType ENTITY_SKELETON_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_DEATH"); + public static final SoundType ENTITY_SKELETON_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HURT"); + + public static final SoundType ENTITY_SKELETON_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_SHOOT"); + + public static final SoundType ENTITY_SKELETON_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_STEP"); + public static final SoundType ENTITY_SKELETON_HORSE_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_AMBIENT"); + public static final SoundType ENTITY_SKELETON_HORSE_AMBIENT_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_AMBIENT_WATER"); + public static final SoundType ENTITY_SKELETON_HORSE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_DEATH"); + public static final SoundType ENTITY_SKELETON_HORSE_GALLOP_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_GALLOP_WATER"); + public static final SoundType ENTITY_SKELETON_HORSE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_HURT"); - public static final SoundType ENTITY_SKELETON_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HURT"); + public static final SoundType ENTITY_SKELETON_HORSE_JUMP_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_JUMP_WATER"); - public static final SoundType ENTITY_SKELETON_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_SHOOT"); + public static final SoundType ENTITY_SKELETON_HORSE_STEP_WATER = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_STEP_WATER"); - public static final SoundType ENTITY_SKELETON_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_STEP"); + public static final SoundType ENTITY_SKELETON_HORSE_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SKELETON_HORSE_SWIM"); public static final SoundType ENTITY_SLIME_ATTACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_ATTACK"); public static final SoundType ENTITY_SLIME_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_DEATH"); + public static final SoundType ENTITY_SLIME_DEATH_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_DEATH_SMALL"); + public static final SoundType ENTITY_SLIME_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_HURT"); - public static final SoundType ENTITY_SLIME_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_JUMP"); + public static final SoundType ENTITY_SLIME_HURT_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_HURT_SMALL"); - public static final SoundType ENTITY_SLIME_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_SQUISH"); + public static final SoundType ENTITY_SLIME_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_JUMP"); - public static final SoundType ENTITY_SMALL_MAGMACUBE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_MAGMACUBE_DEATH"); + public static final SoundType ENTITY_SLIME_JUMP_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_JUMP_SMALL"); - public static final SoundType ENTITY_SMALL_MAGMACUBE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_MAGMACUBE_HURT"); + public static final SoundType ENTITY_SLIME_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_SQUISH"); - public static final SoundType ENTITY_SMALL_MAGMACUBE_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_MAGMACUBE_SQUISH"); + public static final SoundType ENTITY_SLIME_SQUISH_SMALL = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SLIME_SQUISH_SMALL"); - public static final SoundType ENTITY_SMALL_SLIME_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_SLIME_DEATH"); + public static final SoundType ENTITY_SNOW_GOLEM_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOW_GOLEM_AMBIENT"); - public static final SoundType ENTITY_SMALL_SLIME_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_SLIME_HURT"); + public static final SoundType ENTITY_SNOW_GOLEM_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOW_GOLEM_DEATH"); - public static final SoundType ENTITY_SMALL_SLIME_JUMP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_SLIME_JUMP"); + public static final SoundType ENTITY_SNOW_GOLEM_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOW_GOLEM_HURT"); - public static final SoundType ENTITY_SMALL_SLIME_SQUISH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SMALL_SLIME_SQUISH"); + public static final SoundType ENTITY_SNOW_GOLEM_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOW_GOLEM_SHOOT"); public static final SoundType ENTITY_SNOWBALL_THROW = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOWBALL_THROW"); - public static final SoundType ENTITY_SNOWMAN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOWMAN_AMBIENT"); - - public static final SoundType ENTITY_SNOWMAN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOWMAN_DEATH"); - - public static final SoundType ENTITY_SNOWMAN_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOWMAN_HURT"); - - public static final SoundType ENTITY_SNOWMAN_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SNOWMAN_SHOOT"); - public static final SoundType ENTITY_SPIDER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SPIDER_AMBIENT"); public static final SoundType ENTITY_SPIDER_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SPIDER_DEATH"); @@ -923,6 +1071,8 @@ public final class SoundTypes { public static final SoundType ENTITY_SQUID_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SQUID_HURT"); + public static final SoundType ENTITY_SQUID_SQUIRT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_SQUID_SQUIRT"); + public static final SoundType ENTITY_STRAY_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_STRAY_AMBIENT"); public static final SoundType ENTITY_STRAY_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_STRAY_DEATH"); @@ -933,6 +1083,38 @@ public final class SoundTypes { public static final SoundType ENTITY_TNT_PRIMED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TNT_PRIMED"); + public static final SoundType ENTITY_TROPICAL_FISH_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TROPICAL_FISH_AMBIENT"); + + public static final SoundType ENTITY_TROPICAL_FISH_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TROPICAL_FISH_DEATH"); + + public static final SoundType ENTITY_TROPICAL_FISH_FLOP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TROPICAL_FISH_FLOP"); + + public static final SoundType ENTITY_TROPICAL_FISH_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TROPICAL_FISH_HURT"); + + public static final SoundType ENTITY_TURTLE_AMBIENT_LAND = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_AMBIENT_LAND"); + + public static final SoundType ENTITY_TURTLE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_DEATH"); + + public static final SoundType ENTITY_TURTLE_DEATH_BABY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_DEATH_BABY"); + + public static final SoundType ENTITY_TURTLE_EGG_BREAK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_EGG_BREAK"); + + public static final SoundType ENTITY_TURTLE_EGG_CRACK = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_EGG_CRACK"); + + public static final SoundType ENTITY_TURTLE_EGG_HATCH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_EGG_HATCH"); + + public static final SoundType ENTITY_TURTLE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_HURT"); + + public static final SoundType ENTITY_TURTLE_HURT_BABY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_HURT_BABY"); + + public static final SoundType ENTITY_TURTLE_LAY_EGG = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_LAY_EGG"); + + public static final SoundType ENTITY_TURTLE_SHAMBLE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_SHAMBLE"); + + public static final SoundType ENTITY_TURTLE_SHAMBLE_BABY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_SHAMBLE_BABY"); + + public static final SoundType ENTITY_TURTLE_SWIM = DummyObjectProvider.createFor(SoundType.class, "ENTITY_TURTLE_SWIM"); + public static final SoundType ENTITY_VEX_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VEX_AMBIENT"); public static final SoundType ENTITY_VEX_CHARGE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VEX_CHARGE"); @@ -949,17 +1131,15 @@ public final class SoundTypes { public static final SoundType ENTITY_VILLAGER_NO = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VILLAGER_NO"); - public static final SoundType ENTITY_VILLAGER_TRADING = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VILLAGER_TRADING"); + public static final SoundType ENTITY_VILLAGER_TRADE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VILLAGER_TRADE"); public static final SoundType ENTITY_VILLAGER_YES = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VILLAGER_YES"); - public static final SoundType ENTITY_VINDICATION_ILLAGER_AMBIENT = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_VINDICATION_ILLAGER_AMBIENT"); + public static final SoundType ENTITY_VINDICATOR_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VINDICATOR_AMBIENT"); - public static final SoundType ENTITY_VINDICATION_ILLAGER_DEATH = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_VINDICATION_ILLAGER_DEATH"); + public static final SoundType ENTITY_VINDICATOR_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VINDICATOR_DEATH"); - public static final SoundType ENTITY_VINDICATION_ILLAGER_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VINDICATION_ILLAGER_HURT"); + public static final SoundType ENTITY_VINDICATOR_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_VINDICATOR_HURT"); public static final SoundType ENTITY_WITCH_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITCH_AMBIENT"); @@ -981,6 +1161,8 @@ public final class SoundTypes { public static final SoundType ENTITY_WITHER_SHOOT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SHOOT"); + public static final SoundType ENTITY_WITHER_SPAWN = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SPAWN"); + public static final SoundType ENTITY_WITHER_SKELETON_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SKELETON_AMBIENT"); public static final SoundType ENTITY_WITHER_SKELETON_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SKELETON_DEATH"); @@ -989,8 +1171,6 @@ public final class SoundTypes { public static final SoundType ENTITY_WITHER_SKELETON_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SKELETON_STEP"); - public static final SoundType ENTITY_WITHER_SPAWN = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WITHER_SPAWN"); - public static final SoundType ENTITY_WOLF_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WOLF_AMBIENT"); public static final SoundType ENTITY_WOLF_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_WOLF_DEATH"); @@ -1011,38 +1191,41 @@ public final class SoundTypes { public static final SoundType ENTITY_ZOMBIE_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_AMBIENT"); - public static final SoundType ENTITY_ZOMBIE_ATTACK_DOOR_WOOD = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_ATTACK_DOOR_WOOD"); - public static final SoundType ENTITY_ZOMBIE_ATTACK_IRON_DOOR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_ATTACK_IRON_DOOR"); - public static final SoundType ENTITY_ZOMBIE_BREAK_DOOR_WOOD = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_BREAK_DOOR_WOOD"); + public static final SoundType ENTITY_ZOMBIE_ATTACK_WOODEN_DOOR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_ATTACK_WOODEN_DOOR"); - public static final SoundType ENTITY_ZOMBIE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_DEATH"); + public static final SoundType ENTITY_ZOMBIE_BREAK_WOODEN_DOOR = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_BREAK_WOODEN_DOOR"); - public static final SoundType ENTITY_ZOMBIE_HORSE_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_AMBIENT"); + public static final SoundType ENTITY_ZOMBIE_CONVERTED_TO_DROWNED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_CONVERTED_TO_DROWNED"); - public static final SoundType ENTITY_ZOMBIE_HORSE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_DEATH"); + public static final SoundType ENTITY_ZOMBIE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_DEATH"); - public static final SoundType ENTITY_ZOMBIE_HORSE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_HURT"); + public static final SoundType ENTITY_ZOMBIE_DESTROY_EGG = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_DESTROY_EGG"); public static final SoundType ENTITY_ZOMBIE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HURT"); public static final SoundType ENTITY_ZOMBIE_INFECT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_INFECT"); - public static final SoundType ENTITY_ZOMBIE_PIG_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIG_AMBIENT"); + public static final SoundType ENTITY_ZOMBIE_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_STEP"); - public static final SoundType ENTITY_ZOMBIE_PIG_ANGRY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIG_ANGRY"); + public static final SoundType ENTITY_ZOMBIE_HORSE_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_AMBIENT"); - public static final SoundType ENTITY_ZOMBIE_PIG_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIG_DEATH"); + public static final SoundType ENTITY_ZOMBIE_HORSE_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_DEATH"); - public static final SoundType ENTITY_ZOMBIE_PIG_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIG_HURT"); + public static final SoundType ENTITY_ZOMBIE_HORSE_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_HORSE_HURT"); - public static final SoundType ENTITY_ZOMBIE_STEP = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_STEP"); + public static final SoundType ENTITY_ZOMBIE_PIGMAN_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIGMAN_AMBIENT"); + + public static final SoundType ENTITY_ZOMBIE_PIGMAN_ANGRY = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIGMAN_ANGRY"); + + public static final SoundType ENTITY_ZOMBIE_PIGMAN_DEATH = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIGMAN_DEATH"); + + public static final SoundType ENTITY_ZOMBIE_PIGMAN_HURT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_PIGMAN_HURT"); public static final SoundType ENTITY_ZOMBIE_VILLAGER_AMBIENT = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_VILLAGER_AMBIENT"); - public static final SoundType ENTITY_ZOMBIE_VILLAGER_CONVERTED = DummyObjectProvider - .createFor(SoundType.class, "ENTITY_ZOMBIE_VILLAGER_CONVERTED"); + public static final SoundType ENTITY_ZOMBIE_VILLAGER_CONVERTED = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_VILLAGER_CONVERTED"); public static final SoundType ENTITY_ZOMBIE_VILLAGER_CURE = DummyObjectProvider.createFor(SoundType.class, "ENTITY_ZOMBIE_VILLAGER_CURE"); @@ -1066,6 +1249,10 @@ public final class SoundTypes { public static final SoundType ITEM_ARMOR_EQUIP_LEATHER = DummyObjectProvider.createFor(SoundType.class, "ITEM_ARMOR_EQUIP_LEATHER"); + public static final SoundType ITEM_ARMOR_EQUIP_TURTLE = DummyObjectProvider.createFor(SoundType.class, "ITEM_ARMOR_EQUIP_TURTLE"); + + public static final SoundType ITEM_AXE_STRIP = DummyObjectProvider.createFor(SoundType.class, "ITEM_AXE_STRIP"); + public static final SoundType ITEM_BOTTLE_EMPTY = DummyObjectProvider.createFor(SoundType.class, "ITEM_BOTTLE_EMPTY"); public static final SoundType ITEM_BOTTLE_FILL = DummyObjectProvider.createFor(SoundType.class, "ITEM_BOTTLE_FILL"); @@ -1074,10 +1261,14 @@ public final class SoundTypes { public static final SoundType ITEM_BUCKET_EMPTY = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_EMPTY"); + public static final SoundType ITEM_BUCKET_EMPTY_FISH = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_EMPTY_FISH"); + public static final SoundType ITEM_BUCKET_EMPTY_LAVA = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_EMPTY_LAVA"); public static final SoundType ITEM_BUCKET_FILL = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_FILL"); + public static final SoundType ITEM_BUCKET_FILL_FISH = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_FILL_FISH"); + public static final SoundType ITEM_BUCKET_FILL_LAVA = DummyObjectProvider.createFor(SoundType.class, "ITEM_BUCKET_FILL_LAVA"); public static final SoundType ITEM_CHORUS_FRUIT_TELEPORT = DummyObjectProvider.createFor(SoundType.class, "ITEM_CHORUS_FRUIT_TELEPORT"); @@ -1098,6 +1289,22 @@ public final class SoundTypes { public static final SoundType ITEM_TOTEM_USE = DummyObjectProvider.createFor(SoundType.class, "ITEM_TOTEM_USE"); + public static final SoundType ITEM_TRIDENT_HIT = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_HIT"); + + public static final SoundType ITEM_TRIDENT_HIT_GROUND = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_HIT_GROUND"); + + public static final SoundType ITEM_TRIDENT_RETURN = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_RETURN"); + + public static final SoundType ITEM_TRIDENT_RIPTIDE_1 = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_RIPTIDE_1"); + + public static final SoundType ITEM_TRIDENT_RIPTIDE_2 = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_RIPTIDE_2"); + + public static final SoundType ITEM_TRIDENT_RIPTIDE_3 = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_RIPTIDE_3"); + + public static final SoundType ITEM_TRIDENT_THROW = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_THROW"); + + public static final SoundType ITEM_TRIDENT_THUNDER = DummyObjectProvider.createFor(SoundType.class, "ITEM_TRIDENT_THUNDER"); + public static final SoundType MUSIC_CREATIVE = DummyObjectProvider.createFor(SoundType.class, "MUSIC_CREATIVE"); public static final SoundType MUSIC_CREDITS = DummyObjectProvider.createFor(SoundType.class, "MUSIC_CREDITS"); @@ -1112,29 +1319,31 @@ public final class SoundTypes { public static final SoundType MUSIC_NETHER = DummyObjectProvider.createFor(SoundType.class, "MUSIC_NETHER"); - public static final SoundType RECORD_11 = DummyObjectProvider.createFor(SoundType.class, "RECORD_11"); + public static final SoundType MUSIC_UNDER_WATER = DummyObjectProvider.createFor(SoundType.class, "MUSIC_UNDER_WATER"); + + public static final SoundType MUSIC_DISC_11 = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_11"); - public static final SoundType RECORD_13 = DummyObjectProvider.createFor(SoundType.class, "RECORD_13"); + public static final SoundType MUSIC_DISC_13 = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_13"); - public static final SoundType RECORD_BLOCKS = DummyObjectProvider.createFor(SoundType.class, "RECORD_BLOCKS"); + public static final SoundType MUSIC_DISC_BLOCKS = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_BLOCKS"); - public static final SoundType RECORD_CAT = DummyObjectProvider.createFor(SoundType.class, "RECORD_CAT"); + public static final SoundType MUSIC_DISC_CAT = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_CAT"); - public static final SoundType RECORD_CHIRP = DummyObjectProvider.createFor(SoundType.class, "RECORD_CHIRP"); + public static final SoundType MUSIC_DISC_CHIRP = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_CHIRP"); - public static final SoundType RECORD_FAR = DummyObjectProvider.createFor(SoundType.class, "RECORD_FAR"); + public static final SoundType MUSIC_DISC_FAR = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_FAR"); - public static final SoundType RECORD_MALL = DummyObjectProvider.createFor(SoundType.class, "RECORD_MALL"); + public static final SoundType MUSIC_DISC_MALL = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_MALL"); - public static final SoundType RECORD_MELLOHI = DummyObjectProvider.createFor(SoundType.class, "RECORD_MELLOHI"); + public static final SoundType MUSIC_DISC_MELLOHI = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_MELLOHI"); - public static final SoundType RECORD_STAL = DummyObjectProvider.createFor(SoundType.class, "RECORD_STAL"); + public static final SoundType MUSIC_DISC_STAL = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_STAL"); - public static final SoundType RECORD_STRAD = DummyObjectProvider.createFor(SoundType.class, "RECORD_STRAD"); + public static final SoundType MUSIC_DISC_STRAD = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_STRAD"); - public static final SoundType RECORD_WAIT = DummyObjectProvider.createFor(SoundType.class, "RECORD_WAIT"); + public static final SoundType MUSIC_DISC_WAIT = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_WAIT"); - public static final SoundType RECORD_WARD = DummyObjectProvider.createFor(SoundType.class, "RECORD_WARD"); + public static final SoundType MUSIC_DISC_WARD = DummyObjectProvider.createFor(SoundType.class, "MUSIC_DISC_WARD"); public static final SoundType UI_BUTTON_CLICK = DummyObjectProvider.createFor(SoundType.class, "UI_BUTTON_CLICK"); diff --git a/src/main/java/org/spongepowered/api/effect/sound/record/RecordType.java b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java similarity index 88% rename from src/main/java/org/spongepowered/api/effect/sound/record/RecordType.java rename to src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java index e635018c121..97ae88bfc17 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/record/RecordType.java +++ b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDisc.java @@ -22,7 +22,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.effect.sound.record; +package org.spongepowered.api.effect.sound.music; import org.spongepowered.api.CatalogType; import org.spongepowered.api.block.tileentity.Jukebox; @@ -31,15 +31,15 @@ import org.spongepowered.api.util.annotation.CatalogedBy; /** - * Represents the type of record that can be + * Represents the type of music disc that can be * played by a {@link Jukebox}. */ -@CatalogedBy(RecordTypes.class) -public interface RecordType extends CatalogType, Translatable { +@CatalogedBy(MusicDiscs.class) +public interface MusicDisc extends CatalogType, Translatable { /** * Gets the {@link SoundType} that is used - * by this {@link RecordType}. + * by this {@link MusicDisc}. * * @return The sound type */ diff --git a/src/main/java/org/spongepowered/api/data/type/SlabTypes.java b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java similarity index 51% rename from src/main/java/org/spongepowered/api/data/type/SlabTypes.java rename to src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java index 1b1d2035569..2ee5ae1fd2d 100644 --- a/src/main/java/org/spongepowered/api/data/type/SlabTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java @@ -22,40 +22,41 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.data.type; +package org.spongepowered.api.effect.sound.music; import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; -/** - * An enumeration of known {@link SlabType}s. - */ -public final class SlabTypes { +public final class MusicDiscs { // SORTFIELDS:ON - public static final SlabType BRICK = DummyObjectProvider.createFor(SlabType.class, "BRICK"); + public static final MusicDisc BLOCKS = DummyObjectProvider.createFor(MusicDisc.class, "BLOCKS"); + + public static final MusicDisc CAT = DummyObjectProvider.createFor(MusicDisc.class, "CAT"); + + public static final MusicDisc CHIRP = DummyObjectProvider.createFor(MusicDisc.class, "CHIRP"); + + public static final MusicDisc ELEVEN = DummyObjectProvider.createFor(MusicDisc.class, "ELEVEN"); - public static final SlabType COBBLESTONE = DummyObjectProvider.createFor(SlabType.class, "COBBLESTONE"); + public static final MusicDisc FAR = DummyObjectProvider.createFor(MusicDisc.class, "FAR"); - public static final SlabType NETHERBRICK = DummyObjectProvider.createFor(SlabType.class, "NETHERBRICK"); + public static final MusicDisc MALL = DummyObjectProvider.createFor(MusicDisc.class, "MALL"); - public static final SlabType QUARTZ = DummyObjectProvider.createFor(SlabType.class, "QUARTZ"); + public static final MusicDisc MELLOHI = DummyObjectProvider.createFor(MusicDisc.class, "MELLOHI"); - public static final SlabType RED_SAND = DummyObjectProvider.createFor(SlabType.class, "RED_SAND"); + public static final MusicDisc STAL = DummyObjectProvider.createFor(MusicDisc.class, "STAL"); - public static final SlabType SAND = DummyObjectProvider.createFor(SlabType.class, "SAND"); + public static final MusicDisc STRAD = DummyObjectProvider.createFor(MusicDisc.class, "STRAD"); - public static final SlabType SMOOTH_BRICK = DummyObjectProvider.createFor(SlabType.class, "SMOOTH_BRICK"); + public static final MusicDisc THIRTEEN = DummyObjectProvider.createFor(MusicDisc.class, "THIRTEEN"); - public static final SlabType STONE = DummyObjectProvider.createFor(SlabType.class, "STONE"); + public static final MusicDisc WAIT = DummyObjectProvider.createFor(MusicDisc.class, "WAIT"); - public static final SlabType WOOD = DummyObjectProvider.createFor(SlabType.class, "WOOD"); + public static final MusicDisc WARD = DummyObjectProvider.createFor(MusicDisc.class, "WARD"); // SORTFIELDS:OFF - // Suppress default constructor to ensure non-instantiability. - private SlabTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); + private MusicDiscs() { } } diff --git a/src/main/java/org/spongepowered/api/effect/sound/record/package-info.java b/src/main/java/org/spongepowered/api/effect/sound/music/package-info.java similarity index 92% rename from src/main/java/org/spongepowered/api/effect/sound/record/package-info.java rename to src/main/java/org/spongepowered/api/effect/sound/music/package-info.java index 7b9502deaee..27e022535e5 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/record/package-info.java +++ b/src/main/java/org/spongepowered/api/effect/sound/music/package-info.java @@ -22,5 +22,4 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -@org.spongepowered.api.util.annotation.NonnullByDefault -package org.spongepowered.api.effect.sound.record; +@org.spongepowered.api.util.annotation.NonnullByDefault package org.spongepowered.api.effect.sound.music; diff --git a/src/main/java/org/spongepowered/api/effect/sound/record/RecordTypes.java b/src/main/java/org/spongepowered/api/effect/sound/record/RecordTypes.java deleted file mode 100644 index c6c7346310f..00000000000 --- a/src/main/java/org/spongepowered/api/effect/sound/record/RecordTypes.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.effect.sound.record; - -import org.spongepowered.api.util.generator.dummy.DummyObjectProvider; - -public final class RecordTypes { - - // SORTFIELDS:ON - - public static final RecordType BLOCKS = DummyObjectProvider.createFor(RecordType.class, "BLOCKS"); - - public static final RecordType CAT = DummyObjectProvider.createFor(RecordType.class, "CAT"); - - public static final RecordType CHIRP = DummyObjectProvider.createFor(RecordType.class, "CHIRP"); - - public static final RecordType ELEVEN = DummyObjectProvider.createFor(RecordType.class, "ELEVEN"); - - public static final RecordType FAR = DummyObjectProvider.createFor(RecordType.class, "FAR"); - - public static final RecordType MALL = DummyObjectProvider.createFor(RecordType.class, "MALL"); - - public static final RecordType MELLOHI = DummyObjectProvider.createFor(RecordType.class, "MELLOHI"); - - public static final RecordType STAL = DummyObjectProvider.createFor(RecordType.class, "STAL"); - - public static final RecordType STRAD = DummyObjectProvider.createFor(RecordType.class, "STRAD"); - - public static final RecordType THIRTEEN = DummyObjectProvider.createFor(RecordType.class, "THIRTEEN"); - - public static final RecordType WAIT = DummyObjectProvider.createFor(RecordType.class, "WAIT"); - - public static final RecordType WARD = DummyObjectProvider.createFor(RecordType.class, "WARD"); - - // SORTFIELDS:OFF - - // Suppress default constructor to ensure non-instantiability. - private RecordTypes() { - throw new AssertionError("You should not be attempting to instantiate this class."); - } - -} diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java index 5a3b4e0e2da..84ffb7f7f15 100644 --- a/src/main/java/org/spongepowered/api/item/ItemTypes.java +++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java @@ -35,18 +35,40 @@ public final class ItemTypes { public static final ItemType ACACIA_BOAT = DummyObjectProvider.createFor(ItemType.class, "ACACIA_BOAT"); + public static final ItemType ACACIA_BUTTON = DummyObjectProvider.createFor(ItemType.class, "ACACIA_BUTTON"); + public static final ItemType ACACIA_DOOR = DummyObjectProvider.createFor(ItemType.class, "ACACIA_DOOR"); public static final ItemType ACACIA_FENCE = DummyObjectProvider.createFor(ItemType.class, "ACACIA_FENCE"); public static final ItemType ACACIA_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "ACACIA_FENCE_GATE"); + public static final ItemType ACACIA_LEAVES = DummyObjectProvider.createFor(ItemType.class, "ACACIA_LEAVES"); + + public static final ItemType ACACIA_LOG = DummyObjectProvider.createFor(ItemType.class, "ACACIA_LOG"); + + public static final ItemType ACACIA_PLANKS = DummyObjectProvider.createFor(ItemType.class, "ACACIA_PLANKS"); + + public static final ItemType ACACIA_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "ACACIA_PRESSURE_PLATE"); + + public static final ItemType ACACIA_SAPLING = DummyObjectProvider.createFor(ItemType.class, "ACACIA_SAPLING"); + + public static final ItemType ACACIA_SLAB = DummyObjectProvider.createFor(ItemType.class, "ACACIA_SLAB"); + public static final ItemType ACACIA_STAIRS = DummyObjectProvider.createFor(ItemType.class, "ACACIA_STAIRS"); + public static final ItemType ACACIA_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "ACACIA_TRAPDOOR"); + + public static final ItemType ACACIA_WOOD = DummyObjectProvider.createFor(ItemType.class, "ACACIA_WOOD"); + public static final ItemType ACTIVATOR_RAIL = DummyObjectProvider.createFor(ItemType.class, "ACTIVATOR_RAIL"); public static final ItemType AIR = DummyObjectProvider.createFor(ItemType.class, "AIR"); + public static final ItemType ALLIUM = DummyObjectProvider.createFor(ItemType.class, "ALLIUM"); + + public static final ItemType ANDESITE = DummyObjectProvider.createFor(ItemType.class, "ANDESITE"); + public static final ItemType ANVIL = DummyObjectProvider.createFor(ItemType.class, "ANVIL"); public static final ItemType APPLE = DummyObjectProvider.createFor(ItemType.class, "APPLE"); @@ -55,15 +77,15 @@ public final class ItemTypes { public static final ItemType ARROW = DummyObjectProvider.createFor(ItemType.class, "ARROW"); - public static final ItemType BAKED_POTATO = DummyObjectProvider.createFor(ItemType.class, "BAKED_POTATO"); + public static final ItemType AZURE_BLUET = DummyObjectProvider.createFor(ItemType.class, "AZURE_BLUET"); - public static final ItemType BANNER = DummyObjectProvider.createFor(ItemType.class, "BANNER"); + public static final ItemType BAKED_POTATO = DummyObjectProvider.createFor(ItemType.class, "BAKED_POTATO"); public static final ItemType BARRIER = DummyObjectProvider.createFor(ItemType.class, "BARRIER"); - public static final ItemType BEACON = DummyObjectProvider.createFor(ItemType.class, "BEACON"); + public static final ItemType BAT_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "BAT_SPAWN_EGG"); - public static final ItemType BED = DummyObjectProvider.createFor(ItemType.class, "BED"); + public static final ItemType BEACON = DummyObjectProvider.createFor(ItemType.class, "BEACON"); public static final ItemType BEDROCK = DummyObjectProvider.createFor(ItemType.class, "BEDROCK"); @@ -77,32 +99,92 @@ public final class ItemTypes { public static final ItemType BIRCH_BOAT = DummyObjectProvider.createFor(ItemType.class, "BIRCH_BOAT"); + public static final ItemType BIRCH_BUTTON = DummyObjectProvider.createFor(ItemType.class, "BIRCH_BUTTON"); + public static final ItemType BIRCH_DOOR = DummyObjectProvider.createFor(ItemType.class, "BIRCH_DOOR"); public static final ItemType BIRCH_FENCE = DummyObjectProvider.createFor(ItemType.class, "BIRCH_FENCE"); public static final ItemType BIRCH_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "BIRCH_FENCE_GATE"); + public static final ItemType BIRCH_LEAVES = DummyObjectProvider.createFor(ItemType.class, "BIRCH_LEAVES"); + + public static final ItemType BIRCH_LOG = DummyObjectProvider.createFor(ItemType.class, "BIRCH_LOG"); + + public static final ItemType BIRCH_PLANKS = DummyObjectProvider.createFor(ItemType.class, "BIRCH_PLANKS"); + + public static final ItemType BIRCH_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "BIRCH_PRESSURE_PLATE"); + + public static final ItemType BIRCH_SAPLING = DummyObjectProvider.createFor(ItemType.class, "BIRCH_SAPLING"); + + public static final ItemType BIRCH_SLAB = DummyObjectProvider.createFor(ItemType.class, "BIRCH_SLAB"); + public static final ItemType BIRCH_STAIRS = DummyObjectProvider.createFor(ItemType.class, "BIRCH_STAIRS"); + public static final ItemType BIRCH_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "BIRCH_TRAPDOOR"); + + public static final ItemType BIRCH_WOOD = DummyObjectProvider.createFor(ItemType.class, "BIRCH_WOOD"); + + public static final ItemType BLACK_BANNER = DummyObjectProvider.createFor(ItemType.class, "BLACK_BANNER"); + + public static final ItemType BLACK_BED = DummyObjectProvider.createFor(ItemType.class, "BLACK_BED"); + + public static final ItemType BLACK_CARPET = DummyObjectProvider.createFor(ItemType.class, "BLACK_CARPET"); + + public static final ItemType BLACK_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "BLACK_CONCRETE"); + + public static final ItemType BLACK_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "BLACK_CONCRETE_POWDER"); + public static final ItemType BLACK_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BLACK_GLAZED_TERRACOTTA"); public static final ItemType BLACK_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "BLACK_SHULKER_BOX"); + public static final ItemType BLACK_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "BLACK_STAINED_GLASS"); + + public static final ItemType BLACK_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "BLACK_STAINED_GLASS_PANE"); + + public static final ItemType BLACK_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BLACK_TERRACOTTA"); + + public static final ItemType BLACK_WOOL = DummyObjectProvider.createFor(ItemType.class, "BLACK_WOOL"); + public static final ItemType BLAZE_POWDER = DummyObjectProvider.createFor(ItemType.class, "BLAZE_POWDER"); public static final ItemType BLAZE_ROD = DummyObjectProvider.createFor(ItemType.class, "BLAZE_ROD"); + public static final ItemType BLAZE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "BLAZE_SPAWN_EGG"); + + public static final ItemType BLUE_BANNER = DummyObjectProvider.createFor(ItemType.class, "BLUE_BANNER"); + + public static final ItemType BLUE_BED = DummyObjectProvider.createFor(ItemType.class, "BLUE_BED"); + + public static final ItemType BLUE_CARPET = DummyObjectProvider.createFor(ItemType.class, "BLUE_CARPET"); + + public static final ItemType BLUE_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "BLUE_CONCRETE"); + + public static final ItemType BLUE_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "BLUE_CONCRETE_POWDER"); + public static final ItemType BLUE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BLUE_GLAZED_TERRACOTTA"); + public static final ItemType BLUE_ICE = DummyObjectProvider.createFor(ItemType.class, "BLUE_ICE"); + + public static final ItemType BLUE_ORCHID = DummyObjectProvider.createFor(ItemType.class, "BLUE_ORCHID"); + public static final ItemType BLUE_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "BLUE_SHULKER_BOX"); - public static final ItemType BOAT = DummyObjectProvider.createFor(ItemType.class, "BOAT"); + public static final ItemType BLUE_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "BLUE_STAINED_GLASS"); + + public static final ItemType BLUE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "BLUE_STAINED_GLASS_PANE"); + + public static final ItemType BLUE_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BLUE_TERRACOTTA"); + + public static final ItemType BLUE_WOOL = DummyObjectProvider.createFor(ItemType.class, "BLUE_WOOL"); public static final ItemType BONE = DummyObjectProvider.createFor(ItemType.class, "BONE"); public static final ItemType BONE_BLOCK = DummyObjectProvider.createFor(ItemType.class, "BONE_BLOCK"); + public static final ItemType BONE_MEAL = DummyObjectProvider.createFor(ItemType.class, "BONE_MEAL"); + public static final ItemType BOOK = DummyObjectProvider.createFor(ItemType.class, "BOOK"); public static final ItemType BOOKSHELF = DummyObjectProvider.createFor(ItemType.class, "BOOKSHELF"); @@ -111,16 +193,34 @@ public final class ItemTypes { public static final ItemType BOWL = DummyObjectProvider.createFor(ItemType.class, "BOWL"); + public static final ItemType BRAIN_CORAL = DummyObjectProvider.createFor(ItemType.class, "BRAIN_CORAL"); + + public static final ItemType BRAIN_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "BRAIN_CORAL_BLOCK"); + + public static final ItemType BRAIN_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "BRAIN_CORAL_FAN"); + public static final ItemType BREAD = DummyObjectProvider.createFor(ItemType.class, "BREAD"); public static final ItemType BREWING_STAND = DummyObjectProvider.createFor(ItemType.class, "BREWING_STAND"); public static final ItemType BRICK = DummyObjectProvider.createFor(ItemType.class, "BRICK"); - public static final ItemType BRICK_BLOCK = DummyObjectProvider.createFor(ItemType.class, "BRICK_BLOCK"); + public static final ItemType BRICK_SLAB = DummyObjectProvider.createFor(ItemType.class, "BRICK_SLAB"); public static final ItemType BRICK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "BRICK_STAIRS"); + public static final ItemType BRICKS = DummyObjectProvider.createFor(ItemType.class, "BRICKS"); + + public static final ItemType BROWN_BANNER = DummyObjectProvider.createFor(ItemType.class, "BROWN_BANNER"); + + public static final ItemType BROWN_BED = DummyObjectProvider.createFor(ItemType.class, "BROWN_BED"); + + public static final ItemType BROWN_CARPET = DummyObjectProvider.createFor(ItemType.class, "BROWN_CARPET"); + + public static final ItemType BROWN_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "BROWN_CONCRETE"); + + public static final ItemType BROWN_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "BROWN_CONCRETE_POWDER"); + public static final ItemType BROWN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BROWN_GLAZED_TERRACOTTA"); public static final ItemType BROWN_MUSHROOM = DummyObjectProvider.createFor(ItemType.class, "BROWN_MUSHROOM"); @@ -129,20 +229,40 @@ public final class ItemTypes { public static final ItemType BROWN_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "BROWN_SHULKER_BOX"); + public static final ItemType BROWN_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "BROWN_STAINED_GLASS"); + + public static final ItemType BROWN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "BROWN_STAINED_GLASS_PANE"); + + public static final ItemType BROWN_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "BROWN_TERRACOTTA"); + + public static final ItemType BROWN_WOOL = DummyObjectProvider.createFor(ItemType.class, "BROWN_WOOL"); + + public static final ItemType BUBBLE_CORAL = DummyObjectProvider.createFor(ItemType.class, "BUBBLE_CORAL"); + + public static final ItemType BUBBLE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "BUBBLE_CORAL_BLOCK"); + + public static final ItemType BUBBLE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "BUBBLE_CORAL_FAN"); + public static final ItemType BUCKET = DummyObjectProvider.createFor(ItemType.class, "BUCKET"); public static final ItemType CACTUS = DummyObjectProvider.createFor(ItemType.class, "CACTUS"); - public static final ItemType CAKE = DummyObjectProvider.createFor(ItemType.class, "CAKE"); + public static final ItemType CACTUS_GREEN = DummyObjectProvider.createFor(ItemType.class, "CACTUS_GREEN"); - public static final ItemType CARPET = DummyObjectProvider.createFor(ItemType.class, "CARPET"); + public static final ItemType CAKE = DummyObjectProvider.createFor(ItemType.class, "CAKE"); public static final ItemType CARROT = DummyObjectProvider.createFor(ItemType.class, "CARROT"); public static final ItemType CARROT_ON_A_STICK = DummyObjectProvider.createFor(ItemType.class, "CARROT_ON_A_STICK"); + public static final ItemType CARVED_PUMPKIN = DummyObjectProvider.createFor(ItemType.class, "CARVED_PUMPKIN"); + public static final ItemType CAULDRON = DummyObjectProvider.createFor(ItemType.class, "CAULDRON"); + public static final ItemType CAVE_SPIDER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "CAVE_SPIDER_SPAWN_EGG"); + + public static final ItemType CHAIN_COMMAND_BLOCK = DummyObjectProvider.createFor(ItemType.class, "CHAIN_COMMAND_BLOCK"); + public static final ItemType CHAINMAIL_BOOTS = DummyObjectProvider.createFor(ItemType.class, "CHAINMAIL_BOOTS"); public static final ItemType CHAINMAIL_CHESTPLATE = DummyObjectProvider.createFor(ItemType.class, "CHAINMAIL_CHESTPLATE"); @@ -151,7 +271,7 @@ public final class ItemTypes { public static final ItemType CHAINMAIL_LEGGINGS = DummyObjectProvider.createFor(ItemType.class, "CHAINMAIL_LEGGINGS"); - public static final ItemType CHAIN_COMMAND_BLOCK = DummyObjectProvider.createFor(ItemType.class, "CHAIN_COMMAND_BLOCK"); + public static final ItemType CHARCOAL = DummyObjectProvider.createFor(ItemType.class, "CHARCOAL"); public static final ItemType CHEST = DummyObjectProvider.createFor(ItemType.class, "CHEST"); @@ -159,12 +279,22 @@ public final class ItemTypes { public static final ItemType CHICKEN = DummyObjectProvider.createFor(ItemType.class, "CHICKEN"); + public static final ItemType CHICKEN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "CHICKEN_SPAWN_EGG"); + + public static final ItemType CHIPPED_ANVIL = DummyObjectProvider.createFor(ItemType.class, "CHIPPED_ANVIL"); + + public static final ItemType CHISELED_QUARTZ_BLOCK = DummyObjectProvider.createFor(ItemType.class, "CHISELED_QUARTZ_BLOCK"); + + public static final ItemType CHISELED_RED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "CHISELED_RED_SANDSTONE"); + + public static final ItemType CHISELED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "CHISELED_SANDSTONE"); + + public static final ItemType CHISELED_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "CHISELED_STONE_BRICKS"); + public static final ItemType CHORUS_FLOWER = DummyObjectProvider.createFor(ItemType.class, "CHORUS_FLOWER"); public static final ItemType CHORUS_FRUIT = DummyObjectProvider.createFor(ItemType.class, "CHORUS_FRUIT"); - public static final ItemType CHORUS_FRUIT_POPPED = DummyObjectProvider.createFor(ItemType.class, "CHORUS_FRUIT_POPPED"); - public static final ItemType CHORUS_PLANT = DummyObjectProvider.createFor(ItemType.class, "CHORUS_PLANT"); public static final ItemType CLAY = DummyObjectProvider.createFor(ItemType.class, "CLAY"); @@ -179,10 +309,26 @@ public final class ItemTypes { public static final ItemType COAL_ORE = DummyObjectProvider.createFor(ItemType.class, "COAL_ORE"); + public static final ItemType COARSE_DIRT = DummyObjectProvider.createFor(ItemType.class, "COARSE_DIRT"); + public static final ItemType COBBLESTONE = DummyObjectProvider.createFor(ItemType.class, "COBBLESTONE"); + public static final ItemType COBBLESTONE_SLAB = DummyObjectProvider.createFor(ItemType.class, "COBBLESTONE_SLAB"); + + public static final ItemType COBBLESTONE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "COBBLESTONE_STAIRS"); + public static final ItemType COBBLESTONE_WALL = DummyObjectProvider.createFor(ItemType.class, "COBBLESTONE_WALL"); + public static final ItemType COBWEB = DummyObjectProvider.createFor(ItemType.class, "COBWEB"); + + public static final ItemType COCOA_BEANS = DummyObjectProvider.createFor(ItemType.class, "COCOA_BEANS"); + + public static final ItemType COD = DummyObjectProvider.createFor(ItemType.class, "COD"); + + public static final ItemType COD_BUCKET = DummyObjectProvider.createFor(ItemType.class, "COD_BUCKET"); + + public static final ItemType COD_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "COD_SPAWN_EGG"); + public static final ItemType COMMAND_BLOCK = DummyObjectProvider.createFor(ItemType.class, "COMMAND_BLOCK"); public static final ItemType COMMAND_BLOCK_MINECART = DummyObjectProvider.createFor(ItemType.class, "COMMAND_BLOCK_MINECART"); @@ -191,15 +337,13 @@ public final class ItemTypes { public static final ItemType COMPASS = DummyObjectProvider.createFor(ItemType.class, "COMPASS"); - public static final ItemType CONCRETE = DummyObjectProvider.createFor(ItemType.class, "CONCRETE"); - - public static final ItemType CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "CONCRETE_POWDER"); + public static final ItemType CONDUIT = DummyObjectProvider.createFor(ItemType.class, "CONDUIT"); public static final ItemType COOKED_BEEF = DummyObjectProvider.createFor(ItemType.class, "COOKED_BEEF"); public static final ItemType COOKED_CHICKEN = DummyObjectProvider.createFor(ItemType.class, "COOKED_CHICKEN"); - public static final ItemType COOKED_FISH = DummyObjectProvider.createFor(ItemType.class, "COOKED_FISH"); + public static final ItemType COOKED_COD = DummyObjectProvider.createFor(ItemType.class, "COOKED_COD"); public static final ItemType COOKED_MUTTON = DummyObjectProvider.createFor(ItemType.class, "COOKED_MUTTON"); @@ -207,27 +351,123 @@ public final class ItemTypes { public static final ItemType COOKED_RABBIT = DummyObjectProvider.createFor(ItemType.class, "COOKED_RABBIT"); + public static final ItemType COOKED_SALMON = DummyObjectProvider.createFor(ItemType.class, "COOKED_SALMON"); + public static final ItemType COOKIE = DummyObjectProvider.createFor(ItemType.class, "COOKIE"); + public static final ItemType COW_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "COW_SPAWN_EGG"); + + public static final ItemType CRACKED_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "CRACKED_STONE_BRICKS"); + public static final ItemType CRAFTING_TABLE = DummyObjectProvider.createFor(ItemType.class, "CRAFTING_TABLE"); + public static final ItemType CREEPER_HEAD = DummyObjectProvider.createFor(ItemType.class, "CREEPER_HEAD"); + + public static final ItemType CREEPER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "CREEPER_SPAWN_EGG"); + + public static final ItemType CUT_RED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "CUT_RED_SANDSTONE"); + + public static final ItemType CUT_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "CUT_SANDSTONE"); + + public static final ItemType CYAN_BANNER = DummyObjectProvider.createFor(ItemType.class, "CYAN_BANNER"); + + public static final ItemType CYAN_BED = DummyObjectProvider.createFor(ItemType.class, "CYAN_BED"); + + public static final ItemType CYAN_CARPET = DummyObjectProvider.createFor(ItemType.class, "CYAN_CARPET"); + + public static final ItemType CYAN_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "CYAN_CONCRETE"); + + public static final ItemType CYAN_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "CYAN_CONCRETE_POWDER"); + + public static final ItemType CYAN_DYE = DummyObjectProvider.createFor(ItemType.class, "CYAN_DYE"); + public static final ItemType CYAN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "CYAN_GLAZED_TERRACOTTA"); public static final ItemType CYAN_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "CYAN_SHULKER_BOX"); + public static final ItemType CYAN_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "CYAN_STAINED_GLASS"); + + public static final ItemType CYAN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "CYAN_STAINED_GLASS_PANE"); + + public static final ItemType CYAN_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "CYAN_TERRACOTTA"); + + public static final ItemType CYAN_WOOL = DummyObjectProvider.createFor(ItemType.class, "CYAN_WOOL"); + + public static final ItemType DAMAGED_ANVIL = DummyObjectProvider.createFor(ItemType.class, "DAMAGED_ANVIL"); + + public static final ItemType DANDELION = DummyObjectProvider.createFor(ItemType.class, "DANDELION"); + + public static final ItemType DANDELION_YELLOW = DummyObjectProvider.createFor(ItemType.class, "DANDELION_YELLOW"); + public static final ItemType DARK_OAK_BOAT = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_BOAT"); + public static final ItemType DARK_OAK_BUTTON = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_BUTTON"); + public static final ItemType DARK_OAK_DOOR = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_DOOR"); public static final ItemType DARK_OAK_FENCE = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_FENCE"); public static final ItemType DARK_OAK_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_FENCE_GATE"); + public static final ItemType DARK_OAK_LEAVES = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_LEAVES"); + + public static final ItemType DARK_OAK_LOG = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_LOG"); + + public static final ItemType DARK_OAK_PLANKS = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_PLANKS"); + + public static final ItemType DARK_OAK_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_PRESSURE_PLATE"); + + public static final ItemType DARK_OAK_SAPLING = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_SAPLING"); + + public static final ItemType DARK_OAK_SLAB = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_SLAB"); + public static final ItemType DARK_OAK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_STAIRS"); + public static final ItemType DARK_OAK_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_TRAPDOOR"); + + public static final ItemType DARK_OAK_WOOD = DummyObjectProvider.createFor(ItemType.class, "DARK_OAK_WOOD"); + + public static final ItemType DARK_PRISMARINE = DummyObjectProvider.createFor(ItemType.class, "DARK_PRISMARINE"); + + public static final ItemType DARK_PRISMARINE_SLAB = DummyObjectProvider.createFor(ItemType.class, "DARK_PRISMARINE_SLAB"); + + public static final ItemType DARK_PRISMARINE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "DARK_PRISMARINE_STAIRS"); + public static final ItemType DAYLIGHT_DETECTOR = DummyObjectProvider.createFor(ItemType.class, "DAYLIGHT_DETECTOR"); - public static final ItemType DEADBUSH = DummyObjectProvider.createFor(ItemType.class, "DEADBUSH"); + public static final ItemType DEAD_BRAIN_CORAL = DummyObjectProvider.createFor(ItemType.class, "DEAD_BRAIN_CORAL"); + + public static final ItemType DEAD_BRAIN_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DEAD_BRAIN_CORAL_BLOCK"); + + public static final ItemType DEAD_BRAIN_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "DEAD_BRAIN_CORAL_FAN"); + + public static final ItemType DEAD_BUBBLE_CORAL = DummyObjectProvider.createFor(ItemType.class, "DEAD_BUBBLE_CORAL"); + + public static final ItemType DEAD_BUBBLE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DEAD_BUBBLE_CORAL_BLOCK"); + + public static final ItemType DEAD_BUBBLE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "DEAD_BUBBLE_CORAL_FAN"); + + public static final ItemType DEAD_BUSH = DummyObjectProvider.createFor(ItemType.class, "DEAD_BUSH"); + + public static final ItemType DEAD_FIRE_CORAL = DummyObjectProvider.createFor(ItemType.class, "DEAD_FIRE_CORAL"); + + public static final ItemType DEAD_FIRE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DEAD_FIRE_CORAL_BLOCK"); + + public static final ItemType DEAD_FIRE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "DEAD_FIRE_CORAL_FAN"); + + public static final ItemType DEAD_HORN_CORAL = DummyObjectProvider.createFor(ItemType.class, "DEAD_HORN_CORAL"); + + public static final ItemType DEAD_HORN_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DEAD_HORN_CORAL_BLOCK"); + + public static final ItemType DEAD_HORN_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "DEAD_HORN_CORAL_FAN"); + + public static final ItemType DEAD_TUBE_CORAL = DummyObjectProvider.createFor(ItemType.class, "DEAD_TUBE_CORAL"); + + public static final ItemType DEAD_TUBE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DEAD_TUBE_CORAL_BLOCK"); + + public static final ItemType DEAD_TUBE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "DEAD_TUBE_CORAL_FAN"); + + public static final ItemType DEBUG_STICK = DummyObjectProvider.createFor(ItemType.class, "DEBUG_STICK"); public static final ItemType DETECTOR_RAIL = DummyObjectProvider.createFor(ItemType.class, "DETECTOR_RAIL"); @@ -257,22 +497,34 @@ public final class ItemTypes { public static final ItemType DIAMOND_SWORD = DummyObjectProvider.createFor(ItemType.class, "DIAMOND_SWORD"); + public static final ItemType DIORITE = DummyObjectProvider.createFor(ItemType.class, "DIORITE"); + public static final ItemType DIRT = DummyObjectProvider.createFor(ItemType.class, "DIRT"); public static final ItemType DISPENSER = DummyObjectProvider.createFor(ItemType.class, "DISPENSER"); - public static final ItemType DOUBLE_PLANT = DummyObjectProvider.createFor(ItemType.class, "DOUBLE_PLANT"); + public static final ItemType DOLPHIN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "DOLPHIN_SPAWN_EGG"); + + public static final ItemType DONKEY_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "DONKEY_SPAWN_EGG"); public static final ItemType DRAGON_BREATH = DummyObjectProvider.createFor(ItemType.class, "DRAGON_BREATH"); public static final ItemType DRAGON_EGG = DummyObjectProvider.createFor(ItemType.class, "DRAGON_EGG"); + public static final ItemType DRAGON_HEAD = DummyObjectProvider.createFor(ItemType.class, "DRAGON_HEAD"); + + public static final ItemType DRIED_KELP = DummyObjectProvider.createFor(ItemType.class, "DRIED_KELP"); + + public static final ItemType DRIED_KELP_BLOCK = DummyObjectProvider.createFor(ItemType.class, "DRIED_KELP_BLOCK"); + public static final ItemType DROPPER = DummyObjectProvider.createFor(ItemType.class, "DROPPER"); - public static final ItemType DYE = DummyObjectProvider.createFor(ItemType.class, "DYE"); + public static final ItemType DROWNED_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "DROWNED_SPAWN_EGG"); public static final ItemType EGG = DummyObjectProvider.createFor(ItemType.class, "EGG"); + public static final ItemType ELDER_GUARDIAN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ELDER_GUARDIAN_SPAWN_EGG"); + public static final ItemType ELYTRA = DummyObjectProvider.createFor(ItemType.class, "ELYTRA"); public static final ItemType EMERALD = DummyObjectProvider.createFor(ItemType.class, "EMERALD"); @@ -283,23 +535,31 @@ public final class ItemTypes { public static final ItemType ENCHANTED_BOOK = DummyObjectProvider.createFor(ItemType.class, "ENCHANTED_BOOK"); + public static final ItemType ENCHANTED_GOLDEN_APPLE = DummyObjectProvider.createFor(ItemType.class, "ENCHANTED_GOLDEN_APPLE"); + public static final ItemType ENCHANTING_TABLE = DummyObjectProvider.createFor(ItemType.class, "ENCHANTING_TABLE"); + public static final ItemType END_CRYSTAL = DummyObjectProvider.createFor(ItemType.class, "END_CRYSTAL"); + + public static final ItemType END_PORTAL_FRAME = DummyObjectProvider.createFor(ItemType.class, "END_PORTAL_FRAME"); + + public static final ItemType END_ROD = DummyObjectProvider.createFor(ItemType.class, "END_ROD"); + + public static final ItemType END_STONE = DummyObjectProvider.createFor(ItemType.class, "END_STONE"); + + public static final ItemType END_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "END_STONE_BRICKS"); + public static final ItemType ENDER_CHEST = DummyObjectProvider.createFor(ItemType.class, "ENDER_CHEST"); public static final ItemType ENDER_EYE = DummyObjectProvider.createFor(ItemType.class, "ENDER_EYE"); public static final ItemType ENDER_PEARL = DummyObjectProvider.createFor(ItemType.class, "ENDER_PEARL"); - public static final ItemType END_BRICKS = DummyObjectProvider.createFor(ItemType.class, "END_BRICKS"); + public static final ItemType ENDERMAN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ENDERMAN_SPAWN_EGG"); - public static final ItemType END_CRYSTAL = DummyObjectProvider.createFor(ItemType.class, "END_CRYSTAL"); + public static final ItemType ENDERMITE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ENDERMITE_SPAWN_EGG"); - public static final ItemType END_PORTAL_FRAME = DummyObjectProvider.createFor(ItemType.class, "END_PORTAL_FRAME"); - - public static final ItemType END_ROD = DummyObjectProvider.createFor(ItemType.class, "END_ROD"); - - public static final ItemType END_STONE = DummyObjectProvider.createFor(ItemType.class, "END_STONE"); + public static final ItemType EVOKER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "EVOKER_SPAWN_EGG"); public static final ItemType EXPERIENCE_BOTTLE = DummyObjectProvider.createFor(ItemType.class, "EXPERIENCE_BOTTLE"); @@ -307,21 +567,23 @@ public final class ItemTypes { public static final ItemType FEATHER = DummyObjectProvider.createFor(ItemType.class, "FEATHER"); - public static final ItemType FENCE = DummyObjectProvider.createFor(ItemType.class, "FENCE"); - - public static final ItemType FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "FENCE_GATE"); - public static final ItemType FERMENTED_SPIDER_EYE = DummyObjectProvider.createFor(ItemType.class, "FERMENTED_SPIDER_EYE"); + public static final ItemType FERN = DummyObjectProvider.createFor(ItemType.class, "FERN"); + public static final ItemType FILLED_MAP = DummyObjectProvider.createFor(ItemType.class, "FILLED_MAP"); - public static final ItemType FIREWORKS = DummyObjectProvider.createFor(ItemType.class, "FIREWORKS"); + public static final ItemType FIRE_CHARGE = DummyObjectProvider.createFor(ItemType.class, "FIRE_CHARGE"); + + public static final ItemType FIRE_CORAL = DummyObjectProvider.createFor(ItemType.class, "FIRE_CORAL"); - public static final ItemType FIREWORK_CHARGE = DummyObjectProvider.createFor(ItemType.class, "FIREWORK_CHARGE"); + public static final ItemType FIRE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "FIRE_CORAL_BLOCK"); - public static final ItemType FIRE_CHARGE = DummyObjectProvider.createFor(ItemType.class, "FIRE_CHARGE"); + public static final ItemType FIRE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "FIRE_CORAL_FAN"); - public static final ItemType FISH = DummyObjectProvider.createFor(ItemType.class, "FISH"); + public static final ItemType FIREWORK_ROCKET = DummyObjectProvider.createFor(ItemType.class, "FIREWORK_ROCKET"); + + public static final ItemType FIREWORK_STAR = DummyObjectProvider.createFor(ItemType.class, "FIREWORK_STAR"); public static final ItemType FISHING_ROD = DummyObjectProvider.createFor(ItemType.class, "FISHING_ROD"); @@ -335,6 +597,8 @@ public final class ItemTypes { public static final ItemType FURNACE_MINECART = DummyObjectProvider.createFor(ItemType.class, "FURNACE_MINECART"); + public static final ItemType GHAST_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "GHAST_SPAWN_EGG"); + public static final ItemType GHAST_TEAR = DummyObjectProvider.createFor(ItemType.class, "GHAST_TEAR"); public static final ItemType GLASS = DummyObjectProvider.createFor(ItemType.class, "GLASS"); @@ -343,10 +607,20 @@ public final class ItemTypes { public static final ItemType GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "GLASS_PANE"); + public static final ItemType GLISTERING_MELON_SLICE = DummyObjectProvider.createFor(ItemType.class, "GLISTERING_MELON_SLICE"); + public static final ItemType GLOWSTONE = DummyObjectProvider.createFor(ItemType.class, "GLOWSTONE"); public static final ItemType GLOWSTONE_DUST = DummyObjectProvider.createFor(ItemType.class, "GLOWSTONE_DUST"); + public static final ItemType GOLD_BLOCK = DummyObjectProvider.createFor(ItemType.class, "GOLD_BLOCK"); + + public static final ItemType GOLD_INGOT = DummyObjectProvider.createFor(ItemType.class, "GOLD_INGOT"); + + public static final ItemType GOLD_NUGGET = DummyObjectProvider.createFor(ItemType.class, "GOLD_NUGGET"); + + public static final ItemType GOLD_ORE = DummyObjectProvider.createFor(ItemType.class, "GOLD_ORE"); + public static final ItemType GOLDEN_APPLE = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_APPLE"); public static final ItemType GOLDEN_AXE = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_AXE"); @@ -367,51 +641,106 @@ public final class ItemTypes { public static final ItemType GOLDEN_PICKAXE = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_PICKAXE"); - public static final ItemType GOLDEN_RAIL = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_RAIL"); - public static final ItemType GOLDEN_SHOVEL = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_SHOVEL"); public static final ItemType GOLDEN_SWORD = DummyObjectProvider.createFor(ItemType.class, "GOLDEN_SWORD"); - public static final ItemType GOLD_BLOCK = DummyObjectProvider.createFor(ItemType.class, "GOLD_BLOCK"); - - public static final ItemType GOLD_INGOT = DummyObjectProvider.createFor(ItemType.class, "GOLD_INGOT"); - - public static final ItemType GOLD_NUGGET = DummyObjectProvider.createFor(ItemType.class, "GOLD_NUGGET"); - - public static final ItemType GOLD_ORE = DummyObjectProvider.createFor(ItemType.class, "GOLD_ORE"); + public static final ItemType GRANITE = DummyObjectProvider.createFor(ItemType.class, "GRANITE"); public static final ItemType GRASS = DummyObjectProvider.createFor(ItemType.class, "GRASS"); + public static final ItemType GRASS_BLOCK = DummyObjectProvider.createFor(ItemType.class, "GRASS_BLOCK"); + public static final ItemType GRASS_PATH = DummyObjectProvider.createFor(ItemType.class, "GRASS_PATH"); public static final ItemType GRAVEL = DummyObjectProvider.createFor(ItemType.class, "GRAVEL"); + public static final ItemType GRAY_BANNER = DummyObjectProvider.createFor(ItemType.class, "GRAY_BANNER"); + + public static final ItemType GRAY_BED = DummyObjectProvider.createFor(ItemType.class, "GRAY_BED"); + + public static final ItemType GRAY_CARPET = DummyObjectProvider.createFor(ItemType.class, "GRAY_CARPET"); + + public static final ItemType GRAY_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "GRAY_CONCRETE"); + + public static final ItemType GRAY_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "GRAY_CONCRETE_POWDER"); + + public static final ItemType GRAY_DYE = DummyObjectProvider.createFor(ItemType.class, "GRAY_DYE"); + public static final ItemType GRAY_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "GRAY_GLAZED_TERRACOTTA"); public static final ItemType GRAY_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "GRAY_SHULKER_BOX"); + public static final ItemType GRAY_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "GRAY_STAINED_GLASS"); + + public static final ItemType GRAY_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "GRAY_STAINED_GLASS_PANE"); + + public static final ItemType GRAY_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "GRAY_TERRACOTTA"); + + public static final ItemType GRAY_WOOL = DummyObjectProvider.createFor(ItemType.class, "GRAY_WOOL"); + + public static final ItemType GREEN_BANNER = DummyObjectProvider.createFor(ItemType.class, "GREEN_BANNER"); + + public static final ItemType GREEN_BED = DummyObjectProvider.createFor(ItemType.class, "GREEN_BED"); + + public static final ItemType GREEN_CARPET = DummyObjectProvider.createFor(ItemType.class, "GREEN_CARPET"); + + public static final ItemType GREEN_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "GREEN_CONCRETE"); + + public static final ItemType GREEN_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "GREEN_CONCRETE_POWDER"); + public static final ItemType GREEN_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "GREEN_GLAZED_TERRACOTTA"); public static final ItemType GREEN_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "GREEN_SHULKER_BOX"); - public static final ItemType GUNPOWDER = DummyObjectProvider.createFor(ItemType.class, "GUNPOWDER"); + public static final ItemType GREEN_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "GREEN_STAINED_GLASS"); + + public static final ItemType GREEN_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "GREEN_STAINED_GLASS_PANE"); - /** - * This is also known as terracotta. - */ - public static final ItemType HARDENED_CLAY = DummyObjectProvider.createFor(ItemType.class, "HARDENED_CLAY"); + public static final ItemType GREEN_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "GREEN_TERRACOTTA"); + + public static final ItemType GREEN_WOOL = DummyObjectProvider.createFor(ItemType.class, "GREEN_WOOL"); + + public static final ItemType GUARDIAN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "GUARDIAN_SPAWN_EGG"); + + public static final ItemType GUNPOWDER = DummyObjectProvider.createFor(ItemType.class, "GUNPOWDER"); public static final ItemType HAY_BLOCK = DummyObjectProvider.createFor(ItemType.class, "HAY_BLOCK"); + public static final ItemType HEART_OF_THE_SEA = DummyObjectProvider.createFor(ItemType.class, "HEART_OF_THE_SEA"); + public static final ItemType HEAVY_WEIGHTED_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "HEAVY_WEIGHTED_PRESSURE_PLATE"); public static final ItemType HOPPER = DummyObjectProvider.createFor(ItemType.class, "HOPPER"); public static final ItemType HOPPER_MINECART = DummyObjectProvider.createFor(ItemType.class, "HOPPER_MINECART"); + public static final ItemType HORN_CORAL = DummyObjectProvider.createFor(ItemType.class, "HORN_CORAL"); + + public static final ItemType HORN_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "HORN_CORAL_BLOCK"); + + public static final ItemType HORN_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "HORN_CORAL_FAN"); + + public static final ItemType HORSE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "HORSE_SPAWN_EGG"); + + public static final ItemType HUSK_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "HUSK_SPAWN_EGG"); + public static final ItemType ICE = DummyObjectProvider.createFor(ItemType.class, "ICE"); + public static final ItemType INFESTED_CHISELED_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "INFESTED_CHISELED_STONE_BRICKS"); + + public static final ItemType INFESTED_COBBLESTONE = DummyObjectProvider.createFor(ItemType.class, "INFESTED_COBBLESTONE"); + + public static final ItemType INFESTED_CRACKED_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "INFESTED_CRACKED_STONE_BRICKS"); + + public static final ItemType INFESTED_MOSSY_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "INFESTED_MOSSY_STONE_BRICKS"); + + public static final ItemType INFESTED_STONE = DummyObjectProvider.createFor(ItemType.class, "INFESTED_STONE"); + + public static final ItemType INFESTED_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "INFESTED_STONE_BRICKS"); + + public static final ItemType INK_SAC = DummyObjectProvider.createFor(ItemType.class, "INK_SAC"); + public static final ItemType IRON_AXE = DummyObjectProvider.createFor(ItemType.class, "IRON_AXE"); public static final ItemType IRON_BARS = DummyObjectProvider.createFor(ItemType.class, "IRON_BARS"); @@ -448,26 +777,52 @@ public final class ItemTypes { public static final ItemType ITEM_FRAME = DummyObjectProvider.createFor(ItemType.class, "ITEM_FRAME"); + public static final ItemType JACK_O_LANTERN = DummyObjectProvider.createFor(ItemType.class, "JACK_O_LANTERN"); + public static final ItemType JUKEBOX = DummyObjectProvider.createFor(ItemType.class, "JUKEBOX"); public static final ItemType JUNGLE_BOAT = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_BOAT"); + public static final ItemType JUNGLE_BUTTON = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_BUTTON"); + public static final ItemType JUNGLE_DOOR = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_DOOR"); public static final ItemType JUNGLE_FENCE = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_FENCE"); public static final ItemType JUNGLE_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_FENCE_GATE"); + public static final ItemType JUNGLE_LEAVES = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_LEAVES"); + + public static final ItemType JUNGLE_LOG = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_LOG"); + + public static final ItemType JUNGLE_PLANKS = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_PLANKS"); + + public static final ItemType JUNGLE_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_PRESSURE_PLATE"); + + public static final ItemType JUNGLE_SAPLING = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_SAPLING"); + + public static final ItemType JUNGLE_SLAB = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_SLAB"); + public static final ItemType JUNGLE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_STAIRS"); + public static final ItemType JUNGLE_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_TRAPDOOR"); + + public static final ItemType JUNGLE_WOOD = DummyObjectProvider.createFor(ItemType.class, "JUNGLE_WOOD"); + + public static final ItemType KELP = DummyObjectProvider.createFor(ItemType.class, "KELP"); + public static final ItemType KNOWLEDGE_BOOK = DummyObjectProvider.createFor(ItemType.class, "KNOWLEDGE_BOOK"); public static final ItemType LADDER = DummyObjectProvider.createFor(ItemType.class, "LADDER"); public static final ItemType LAPIS_BLOCK = DummyObjectProvider.createFor(ItemType.class, "LAPIS_BLOCK"); + public static final ItemType LAPIS_LAZULI = DummyObjectProvider.createFor(ItemType.class, "LAPIS_LAZULI"); + public static final ItemType LAPIS_ORE = DummyObjectProvider.createFor(ItemType.class, "LAPIS_ORE"); + public static final ItemType LARGE_FERN = DummyObjectProvider.createFor(ItemType.class, "LARGE_FERN"); + public static final ItemType LAVA_BUCKET = DummyObjectProvider.createFor(ItemType.class, "LAVA_BUCKET"); public static final ItemType LEAD = DummyObjectProvider.createFor(ItemType.class, "LEAD"); @@ -482,132 +837,386 @@ public final class ItemTypes { public static final ItemType LEATHER_LEGGINGS = DummyObjectProvider.createFor(ItemType.class, "LEATHER_LEGGINGS"); - public static final ItemType LEAVES = DummyObjectProvider.createFor(ItemType.class, "LEAVES"); + public static final ItemType LEVER = DummyObjectProvider.createFor(ItemType.class, "LEVER"); - public static final ItemType LEAVES2 = DummyObjectProvider.createFor(ItemType.class, "LEAVES2"); + public static final ItemType LIGHT_BLUE_BANNER = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_BANNER"); - public static final ItemType LEVER = DummyObjectProvider.createFor(ItemType.class, "LEVER"); + public static final ItemType LIGHT_BLUE_BED = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_BED"); + + public static final ItemType LIGHT_BLUE_CARPET = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_CARPET"); + + public static final ItemType LIGHT_BLUE_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_CONCRETE"); + + public static final ItemType LIGHT_BLUE_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_CONCRETE_POWDER"); + + public static final ItemType LIGHT_BLUE_DYE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_DYE"); public static final ItemType LIGHT_BLUE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_GLAZED_TERRACOTTA"); public static final ItemType LIGHT_BLUE_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_SHULKER_BOX"); + public static final ItemType LIGHT_BLUE_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_STAINED_GLASS"); + + public static final ItemType LIGHT_BLUE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_STAINED_GLASS_PANE"); + + public static final ItemType LIGHT_BLUE_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_TERRACOTTA"); + + public static final ItemType LIGHT_BLUE_WOOL = DummyObjectProvider.createFor(ItemType.class, "LIGHT_BLUE_WOOL"); + + public static final ItemType LIGHT_GRAY_BANNER = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_BANNER"); + + public static final ItemType LIGHT_GRAY_BED = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_BED"); + + public static final ItemType LIGHT_GRAY_CARPET = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_CARPET"); + + public static final ItemType LIGHT_GRAY_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_CONCRETE"); + + public static final ItemType LIGHT_GRAY_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_CONCRETE_POWDER"); + + public static final ItemType LIGHT_GRAY_DYE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_DYE"); + + public static final ItemType LIGHT_GRAY_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_GLAZED_TERRACOTTA"); + + public static final ItemType LIGHT_GRAY_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_SHULKER_BOX"); + + public static final ItemType LIGHT_GRAY_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_STAINED_GLASS"); + + public static final ItemType LIGHT_GRAY_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_STAINED_GLASS_PANE"); + + public static final ItemType LIGHT_GRAY_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_TERRACOTTA"); + + public static final ItemType LIGHT_GRAY_WOOL = DummyObjectProvider.createFor(ItemType.class, "LIGHT_GRAY_WOOL"); + public static final ItemType LIGHT_WEIGHTED_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "LIGHT_WEIGHTED_PRESSURE_PLATE"); + public static final ItemType LILAC = DummyObjectProvider.createFor(ItemType.class, "LILAC"); + + public static final ItemType LILY_PAD = DummyObjectProvider.createFor(ItemType.class, "LILY_PAD"); + + public static final ItemType LIME_BANNER = DummyObjectProvider.createFor(ItemType.class, "LIME_BANNER"); + + public static final ItemType LIME_BED = DummyObjectProvider.createFor(ItemType.class, "LIME_BED"); + + public static final ItemType LIME_CARPET = DummyObjectProvider.createFor(ItemType.class, "LIME_CARPET"); + + public static final ItemType LIME_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "LIME_CONCRETE"); + + public static final ItemType LIME_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "LIME_CONCRETE_POWDER"); + + public static final ItemType LIME_DYE = DummyObjectProvider.createFor(ItemType.class, "LIME_DYE"); + public static final ItemType LIME_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIME_GLAZED_TERRACOTTA"); public static final ItemType LIME_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "LIME_SHULKER_BOX"); + public static final ItemType LIME_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "LIME_STAINED_GLASS"); + + public static final ItemType LIME_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "LIME_STAINED_GLASS_PANE"); + + public static final ItemType LIME_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "LIME_TERRACOTTA"); + + public static final ItemType LIME_WOOL = DummyObjectProvider.createFor(ItemType.class, "LIME_WOOL"); + public static final ItemType LINGERING_POTION = DummyObjectProvider.createFor(ItemType.class, "LINGERING_POTION"); - public static final ItemType LIT_PUMPKIN = DummyObjectProvider.createFor(ItemType.class, "LIT_PUMPKIN"); + public static final ItemType LLAMA_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "LLAMA_SPAWN_EGG"); + + public static final ItemType MAGENTA_BANNER = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_BANNER"); - public static final ItemType LOG = DummyObjectProvider.createFor(ItemType.class, "LOG"); + public static final ItemType MAGENTA_BED = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_BED"); - public static final ItemType LOG2 = DummyObjectProvider.createFor(ItemType.class, "LOG2"); + public static final ItemType MAGENTA_CARPET = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_CARPET"); + + public static final ItemType MAGENTA_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_CONCRETE"); + + public static final ItemType MAGENTA_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_CONCRETE_POWDER"); + + public static final ItemType MAGENTA_DYE = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_DYE"); public static final ItemType MAGENTA_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_GLAZED_TERRACOTTA"); public static final ItemType MAGENTA_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_SHULKER_BOX"); - public static final ItemType MAGMA = DummyObjectProvider.createFor(ItemType.class, "MAGMA"); + public static final ItemType MAGENTA_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_STAINED_GLASS"); + + public static final ItemType MAGENTA_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_STAINED_GLASS_PANE"); + + public static final ItemType MAGENTA_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_TERRACOTTA"); + + public static final ItemType MAGENTA_WOOL = DummyObjectProvider.createFor(ItemType.class, "MAGENTA_WOOL"); + + public static final ItemType MAGMA_BLOCK = DummyObjectProvider.createFor(ItemType.class, "MAGMA_BLOCK"); public static final ItemType MAGMA_CREAM = DummyObjectProvider.createFor(ItemType.class, "MAGMA_CREAM"); + public static final ItemType MAGMA_CUBE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "MAGMA_CUBE_SPAWN_EGG"); + public static final ItemType MAP = DummyObjectProvider.createFor(ItemType.class, "MAP"); public static final ItemType MELON = DummyObjectProvider.createFor(ItemType.class, "MELON"); - public static final ItemType MELON_BLOCK = DummyObjectProvider.createFor(ItemType.class, "MELON_BLOCK"); - public static final ItemType MELON_SEEDS = DummyObjectProvider.createFor(ItemType.class, "MELON_SEEDS"); + public static final ItemType MELON_SLICE = DummyObjectProvider.createFor(ItemType.class, "MELON_SLICE"); + public static final ItemType MILK_BUCKET = DummyObjectProvider.createFor(ItemType.class, "MILK_BUCKET"); public static final ItemType MINECART = DummyObjectProvider.createFor(ItemType.class, "MINECART"); - public static final ItemType MOB_SPAWNER = DummyObjectProvider.createFor(ItemType.class, "MOB_SPAWNER"); - - public static final ItemType MONSTER_EGG = DummyObjectProvider.createFor(ItemType.class, "MONSTER_EGG"); + public static final ItemType MOOSHROOM_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "MOOSHROOM_SPAWN_EGG"); public static final ItemType MOSSY_COBBLESTONE = DummyObjectProvider.createFor(ItemType.class, "MOSSY_COBBLESTONE"); + public static final ItemType MOSSY_COBBLESTONE_WALL = DummyObjectProvider.createFor(ItemType.class, "MOSSY_COBBLESTONE_WALL"); + + public static final ItemType MOSSY_STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "MOSSY_STONE_BRICKS"); + + public static final ItemType MULE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "MULE_SPAWN_EGG"); + + public static final ItemType MUSHROOM_STEM = DummyObjectProvider.createFor(ItemType.class, "MUSHROOM_STEM"); + public static final ItemType MUSHROOM_STEW = DummyObjectProvider.createFor(ItemType.class, "MUSHROOM_STEW"); + public static final ItemType MUSIC_DISC_11 = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_11"); + + public static final ItemType MUSIC_DISC_13 = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_13"); + + public static final ItemType MUSIC_DISC_BLOCKS = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_BLOCKS"); + + public static final ItemType MUSIC_DISC_CAT = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_CAT"); + + public static final ItemType MUSIC_DISC_CHIRP = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_CHIRP"); + + public static final ItemType MUSIC_DISC_FAR = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_FAR"); + + public static final ItemType MUSIC_DISC_MALL = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_MALL"); + + public static final ItemType MUSIC_DISC_MELLOHI = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_MELLOHI"); + + public static final ItemType MUSIC_DISC_STAL = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_STAL"); + + public static final ItemType MUSIC_DISC_STRAD = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_STRAD"); + + public static final ItemType MUSIC_DISC_WAIT = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_WAIT"); + + public static final ItemType MUSIC_DISC_WARD = DummyObjectProvider.createFor(ItemType.class, "MUSIC_DISC_WARD"); + public static final ItemType MUTTON = DummyObjectProvider.createFor(ItemType.class, "MUTTON"); public static final ItemType MYCELIUM = DummyObjectProvider.createFor(ItemType.class, "MYCELIUM"); public static final ItemType NAME_TAG = DummyObjectProvider.createFor(ItemType.class, "NAME_TAG"); - public static final ItemType NETHERBRICK = DummyObjectProvider.createFor(ItemType.class, "NETHERBRICK"); - - public static final ItemType NETHERRACK = DummyObjectProvider.createFor(ItemType.class, "NETHERRACK"); + public static final ItemType NAUTILUS_SHELL = DummyObjectProvider.createFor(ItemType.class, "NAUTILUS_SHELL"); public static final ItemType NETHER_BRICK = DummyObjectProvider.createFor(ItemType.class, "NETHER_BRICK"); public static final ItemType NETHER_BRICK_FENCE = DummyObjectProvider.createFor(ItemType.class, "NETHER_BRICK_FENCE"); + public static final ItemType NETHER_BRICK_SLAB = DummyObjectProvider.createFor(ItemType.class, "NETHER_BRICK_SLAB"); + public static final ItemType NETHER_BRICK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "NETHER_BRICK_STAIRS"); + public static final ItemType NETHER_BRICKS = DummyObjectProvider.createFor(ItemType.class, "NETHER_BRICKS"); + + public static final ItemType NETHER_QUARTZ_ORE = DummyObjectProvider.createFor(ItemType.class, "NETHER_QUARTZ_ORE"); + public static final ItemType NETHER_STAR = DummyObjectProvider.createFor(ItemType.class, "NETHER_STAR"); public static final ItemType NETHER_WART = DummyObjectProvider.createFor(ItemType.class, "NETHER_WART"); public static final ItemType NETHER_WART_BLOCK = DummyObjectProvider.createFor(ItemType.class, "NETHER_WART_BLOCK"); - public static final ItemType NONE = DummyObjectProvider.createFor(ItemType.class, "NONE"); + public static final ItemType NETHERRACK = DummyObjectProvider.createFor(ItemType.class, "NETHERRACK"); + + public static final ItemType NOTE_BLOCK = DummyObjectProvider.createFor(ItemType.class, "NOTE_BLOCK"); + + public static final ItemType OAK_BOAT = DummyObjectProvider.createFor(ItemType.class, "OAK_BOAT"); + + public static final ItemType OAK_BUTTON = DummyObjectProvider.createFor(ItemType.class, "OAK_BUTTON"); + + public static final ItemType OAK_DOOR = DummyObjectProvider.createFor(ItemType.class, "OAK_DOOR"); + + public static final ItemType OAK_FENCE = DummyObjectProvider.createFor(ItemType.class, "OAK_FENCE"); + + public static final ItemType OAK_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "OAK_FENCE_GATE"); + + public static final ItemType OAK_LEAVES = DummyObjectProvider.createFor(ItemType.class, "OAK_LEAVES"); + + public static final ItemType OAK_LOG = DummyObjectProvider.createFor(ItemType.class, "OAK_LOG"); - public static final ItemType NOTEBLOCK = DummyObjectProvider.createFor(ItemType.class, "NOTEBLOCK"); + public static final ItemType OAK_PLANKS = DummyObjectProvider.createFor(ItemType.class, "OAK_PLANKS"); + + public static final ItemType OAK_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "OAK_PRESSURE_PLATE"); + + public static final ItemType OAK_SAPLING = DummyObjectProvider.createFor(ItemType.class, "OAK_SAPLING"); + + public static final ItemType OAK_SLAB = DummyObjectProvider.createFor(ItemType.class, "OAK_SLAB"); public static final ItemType OAK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "OAK_STAIRS"); + public static final ItemType OAK_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "OAK_TRAPDOOR"); + + public static final ItemType OAK_WOOD = DummyObjectProvider.createFor(ItemType.class, "OAK_WOOD"); + public static final ItemType OBSERVER = DummyObjectProvider.createFor(ItemType.class, "OBSERVER"); public static final ItemType OBSIDIAN = DummyObjectProvider.createFor(ItemType.class, "OBSIDIAN"); + public static final ItemType OCELOT_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "OCELOT_SPAWN_EGG"); + + public static final ItemType ORANGE_BANNER = DummyObjectProvider.createFor(ItemType.class, "ORANGE_BANNER"); + + public static final ItemType ORANGE_BED = DummyObjectProvider.createFor(ItemType.class, "ORANGE_BED"); + + public static final ItemType ORANGE_CARPET = DummyObjectProvider.createFor(ItemType.class, "ORANGE_CARPET"); + + public static final ItemType ORANGE_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "ORANGE_CONCRETE"); + + public static final ItemType ORANGE_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "ORANGE_CONCRETE_POWDER"); + + public static final ItemType ORANGE_DYE = DummyObjectProvider.createFor(ItemType.class, "ORANGE_DYE"); + public static final ItemType ORANGE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "ORANGE_GLAZED_TERRACOTTA"); public static final ItemType ORANGE_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "ORANGE_SHULKER_BOX"); + public static final ItemType ORANGE_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "ORANGE_STAINED_GLASS"); + + public static final ItemType ORANGE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "ORANGE_STAINED_GLASS_PANE"); + + public static final ItemType ORANGE_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "ORANGE_TERRACOTTA"); + + public static final ItemType ORANGE_TULIP = DummyObjectProvider.createFor(ItemType.class, "ORANGE_TULIP"); + + public static final ItemType ORANGE_WOOL = DummyObjectProvider.createFor(ItemType.class, "ORANGE_WOOL"); + + public static final ItemType OXEYE_DAISY = DummyObjectProvider.createFor(ItemType.class, "OXEYE_DAISY"); + public static final ItemType PACKED_ICE = DummyObjectProvider.createFor(ItemType.class, "PACKED_ICE"); public static final ItemType PAINTING = DummyObjectProvider.createFor(ItemType.class, "PAINTING"); public static final ItemType PAPER = DummyObjectProvider.createFor(ItemType.class, "PAPER"); + public static final ItemType PARROT_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "PARROT_SPAWN_EGG"); + + public static final ItemType PEONY = DummyObjectProvider.createFor(ItemType.class, "PEONY"); + + public static final ItemType PETRIFIED_OAK_SLAB = DummyObjectProvider.createFor(ItemType.class, "PETRIFIED_OAK_SLAB"); + + public static final ItemType PHANTOM_MEMBRANE = DummyObjectProvider.createFor(ItemType.class, "PHANTOM_MEMBRANE"); + + public static final ItemType PHANTOM_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "PHANTOM_SPAWN_EGG"); + + public static final ItemType PIG_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "PIG_SPAWN_EGG"); + + public static final ItemType PINK_BANNER = DummyObjectProvider.createFor(ItemType.class, "PINK_BANNER"); + + public static final ItemType PINK_BED = DummyObjectProvider.createFor(ItemType.class, "PINK_BED"); + + public static final ItemType PINK_CARPET = DummyObjectProvider.createFor(ItemType.class, "PINK_CARPET"); + + public static final ItemType PINK_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "PINK_CONCRETE"); + + public static final ItemType PINK_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "PINK_CONCRETE_POWDER"); + + public static final ItemType PINK_DYE = DummyObjectProvider.createFor(ItemType.class, "PINK_DYE"); + public static final ItemType PINK_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "PINK_GLAZED_TERRACOTTA"); public static final ItemType PINK_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "PINK_SHULKER_BOX"); + public static final ItemType PINK_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "PINK_STAINED_GLASS"); + + public static final ItemType PINK_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "PINK_STAINED_GLASS_PANE"); + + public static final ItemType PINK_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "PINK_TERRACOTTA"); + + public static final ItemType PINK_TULIP = DummyObjectProvider.createFor(ItemType.class, "PINK_TULIP"); + + public static final ItemType PINK_WOOL = DummyObjectProvider.createFor(ItemType.class, "PINK_WOOL"); + public static final ItemType PISTON = DummyObjectProvider.createFor(ItemType.class, "PISTON"); - public static final ItemType PLANKS = DummyObjectProvider.createFor(ItemType.class, "PLANKS"); + public static final ItemType PLAYER_HEAD = DummyObjectProvider.createFor(ItemType.class, "PLAYER_HEAD"); + + public static final ItemType PODZOL = DummyObjectProvider.createFor(ItemType.class, "PODZOL"); public static final ItemType POISONOUS_POTATO = DummyObjectProvider.createFor(ItemType.class, "POISONOUS_POTATO"); + public static final ItemType POLAR_BEAR_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "POLAR_BEAR_SPAWN_EGG"); + + public static final ItemType POLISHED_ANDESITE = DummyObjectProvider.createFor(ItemType.class, "POLISHED_ANDESITE"); + + public static final ItemType POLISHED_DIORITE = DummyObjectProvider.createFor(ItemType.class, "POLISHED_DIORITE"); + + public static final ItemType POLISHED_GRANITE = DummyObjectProvider.createFor(ItemType.class, "POLISHED_GRANITE"); + + public static final ItemType POPPED_CHORUS_FRUIT = DummyObjectProvider.createFor(ItemType.class, "POPPED_CHORUS_FRUIT"); + + public static final ItemType POPPY = DummyObjectProvider.createFor(ItemType.class, "POPPY"); + public static final ItemType PORKCHOP = DummyObjectProvider.createFor(ItemType.class, "PORKCHOP"); public static final ItemType POTATO = DummyObjectProvider.createFor(ItemType.class, "POTATO"); public static final ItemType POTION = DummyObjectProvider.createFor(ItemType.class, "POTION"); + public static final ItemType POWERED_RAIL = DummyObjectProvider.createFor(ItemType.class, "POWERED_RAIL"); + public static final ItemType PRISMARINE = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE"); + public static final ItemType PRISMARINE_BRICK_SLAB = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_BRICK_SLAB"); + + public static final ItemType PRISMARINE_BRICK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_BRICK_STAIRS"); + + public static final ItemType PRISMARINE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_BRICKS"); + public static final ItemType PRISMARINE_CRYSTALS = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_CRYSTALS"); public static final ItemType PRISMARINE_SHARD = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_SHARD"); + public static final ItemType PRISMARINE_SLAB = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_SLAB"); + + public static final ItemType PRISMARINE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "PRISMARINE_STAIRS"); + + public static final ItemType PUFFERFISH = DummyObjectProvider.createFor(ItemType.class, "PUFFERFISH"); + + public static final ItemType PUFFERFISH_BUCKET = DummyObjectProvider.createFor(ItemType.class, "PUFFERFISH_BUCKET"); + + public static final ItemType PUFFERFISH_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "PUFFERFISH_SPAWN_EGG"); + public static final ItemType PUMPKIN = DummyObjectProvider.createFor(ItemType.class, "PUMPKIN"); public static final ItemType PUMPKIN_PIE = DummyObjectProvider.createFor(ItemType.class, "PUMPKIN_PIE"); public static final ItemType PUMPKIN_SEEDS = DummyObjectProvider.createFor(ItemType.class, "PUMPKIN_SEEDS"); + public static final ItemType PURPLE_BANNER = DummyObjectProvider.createFor(ItemType.class, "PURPLE_BANNER"); + + public static final ItemType PURPLE_BED = DummyObjectProvider.createFor(ItemType.class, "PURPLE_BED"); + + public static final ItemType PURPLE_CARPET = DummyObjectProvider.createFor(ItemType.class, "PURPLE_CARPET"); + + public static final ItemType PURPLE_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "PURPLE_CONCRETE"); + + public static final ItemType PURPLE_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "PURPLE_CONCRETE_POWDER"); + + public static final ItemType PURPLE_DYE = DummyObjectProvider.createFor(ItemType.class, "PURPLE_DYE"); + public static final ItemType PURPLE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "PURPLE_GLAZED_TERRACOTTA"); public static final ItemType PURPLE_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "PURPLE_SHULKER_BOX"); + public static final ItemType PURPLE_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "PURPLE_STAINED_GLASS"); + + public static final ItemType PURPLE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "PURPLE_STAINED_GLASS_PANE"); + + public static final ItemType PURPLE_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "PURPLE_TERRACOTTA"); + + public static final ItemType PURPLE_WOOL = DummyObjectProvider.createFor(ItemType.class, "PURPLE_WOOL"); + public static final ItemType PURPUR_BLOCK = DummyObjectProvider.createFor(ItemType.class, "PURPUR_BLOCK"); public static final ItemType PURPUR_PILLAR = DummyObjectProvider.createFor(ItemType.class, "PURPUR_PILLAR"); @@ -620,7 +1229,9 @@ public final class ItemTypes { public static final ItemType QUARTZ_BLOCK = DummyObjectProvider.createFor(ItemType.class, "QUARTZ_BLOCK"); - public static final ItemType QUARTZ_ORE = DummyObjectProvider.createFor(ItemType.class, "QUARTZ_ORE"); + public static final ItemType QUARTZ_PILLAR = DummyObjectProvider.createFor(ItemType.class, "QUARTZ_PILLAR"); + + public static final ItemType QUARTZ_SLAB = DummyObjectProvider.createFor(ItemType.class, "QUARTZ_SLAB"); public static final ItemType QUARTZ_STAIRS = DummyObjectProvider.createFor(ItemType.class, "QUARTZ_STAIRS"); @@ -630,142 +1241,179 @@ public final class ItemTypes { public static final ItemType RABBIT_HIDE = DummyObjectProvider.createFor(ItemType.class, "RABBIT_HIDE"); + public static final ItemType RABBIT_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "RABBIT_SPAWN_EGG"); + public static final ItemType RABBIT_STEW = DummyObjectProvider.createFor(ItemType.class, "RABBIT_STEW"); public static final ItemType RAIL = DummyObjectProvider.createFor(ItemType.class, "RAIL"); - public static final ItemType RECORD_11 = DummyObjectProvider.createFor(ItemType.class, "RECORD_11"); + public static final ItemType RED_BANNER = DummyObjectProvider.createFor(ItemType.class, "RED_BANNER"); - public static final ItemType RECORD_13 = DummyObjectProvider.createFor(ItemType.class, "RECORD_13"); + public static final ItemType RED_BED = DummyObjectProvider.createFor(ItemType.class, "RED_BED"); - public static final ItemType RECORD_BLOCKS = DummyObjectProvider.createFor(ItemType.class, "RECORD_BLOCKS"); + public static final ItemType RED_CARPET = DummyObjectProvider.createFor(ItemType.class, "RED_CARPET"); - public static final ItemType RECORD_CAT = DummyObjectProvider.createFor(ItemType.class, "RECORD_CAT"); + public static final ItemType RED_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "RED_CONCRETE"); - public static final ItemType RECORD_CHIRP = DummyObjectProvider.createFor(ItemType.class, "RECORD_CHIRP"); + public static final ItemType RED_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "RED_CONCRETE_POWDER"); - public static final ItemType RECORD_FAR = DummyObjectProvider.createFor(ItemType.class, "RECORD_FAR"); + public static final ItemType RED_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "RED_GLAZED_TERRACOTTA"); - public static final ItemType RECORD_MALL = DummyObjectProvider.createFor(ItemType.class, "RECORD_MALL"); + public static final ItemType RED_MUSHROOM = DummyObjectProvider.createFor(ItemType.class, "RED_MUSHROOM"); - public static final ItemType RECORD_MELLOHI = DummyObjectProvider.createFor(ItemType.class, "RECORD_MELLOHI"); + public static final ItemType RED_MUSHROOM_BLOCK = DummyObjectProvider.createFor(ItemType.class, "RED_MUSHROOM_BLOCK"); - public static final ItemType RECORD_STAL = DummyObjectProvider.createFor(ItemType.class, "RECORD_STAL"); + public static final ItemType RED_NETHER_BRICKS = DummyObjectProvider.createFor(ItemType.class, "RED_NETHER_BRICKS"); - public static final ItemType RECORD_STRAD = DummyObjectProvider.createFor(ItemType.class, "RECORD_STRAD"); + public static final ItemType RED_SAND = DummyObjectProvider.createFor(ItemType.class, "RED_SAND"); - public static final ItemType RECORD_WAIT = DummyObjectProvider.createFor(ItemType.class, "RECORD_WAIT"); + public static final ItemType RED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "RED_SANDSTONE"); - public static final ItemType RECORD_WARD = DummyObjectProvider.createFor(ItemType.class, "RECORD_WARD"); + public static final ItemType RED_SANDSTONE_SLAB = DummyObjectProvider.createFor(ItemType.class, "RED_SANDSTONE_SLAB"); - public static final ItemType REDSTONE = DummyObjectProvider.createFor(ItemType.class, "REDSTONE"); + public static final ItemType RED_SANDSTONE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "RED_SANDSTONE_STAIRS"); - public static final ItemType REDSTONE_BLOCK = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_BLOCK"); + public static final ItemType RED_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "RED_SHULKER_BOX"); - public static final ItemType REDSTONE_LAMP = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_LAMP"); + public static final ItemType RED_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "RED_STAINED_GLASS"); - public static final ItemType REDSTONE_ORE = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_ORE"); + public static final ItemType RED_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "RED_STAINED_GLASS_PANE"); - public static final ItemType REDSTONE_TORCH = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_TORCH"); + public static final ItemType RED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "RED_TERRACOTTA"); - public static final ItemType RED_FLOWER = DummyObjectProvider.createFor(ItemType.class, "RED_FLOWER"); + public static final ItemType RED_TULIP = DummyObjectProvider.createFor(ItemType.class, "RED_TULIP"); - public static final ItemType RED_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "RED_GLAZED_TERRACOTTA"); + public static final ItemType RED_WOOL = DummyObjectProvider.createFor(ItemType.class, "RED_WOOL"); - public static final ItemType RED_MUSHROOM = DummyObjectProvider.createFor(ItemType.class, "RED_MUSHROOM"); - - public static final ItemType RED_MUSHROOM_BLOCK = DummyObjectProvider.createFor(ItemType.class, "RED_MUSHROOM_BLOCK"); - - public static final ItemType RED_NETHER_BRICK = DummyObjectProvider.createFor(ItemType.class, "RED_NETHER_BRICK"); + public static final ItemType REDSTONE = DummyObjectProvider.createFor(ItemType.class, "REDSTONE"); - public static final ItemType RED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "RED_SANDSTONE"); + public static final ItemType REDSTONE_BLOCK = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_BLOCK"); - public static final ItemType RED_SANDSTONE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "RED_SANDSTONE_STAIRS"); + public static final ItemType REDSTONE_LAMP = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_LAMP"); - public static final ItemType RED_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "RED_SHULKER_BOX"); + public static final ItemType REDSTONE_ORE = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_ORE"); - public static final ItemType REEDS = DummyObjectProvider.createFor(ItemType.class, "REEDS"); + public static final ItemType REDSTONE_TORCH = DummyObjectProvider.createFor(ItemType.class, "REDSTONE_TORCH"); public static final ItemType REPEATER = DummyObjectProvider.createFor(ItemType.class, "REPEATER"); public static final ItemType REPEATING_COMMAND_BLOCK = DummyObjectProvider.createFor(ItemType.class, "REPEATING_COMMAND_BLOCK"); + public static final ItemType ROSE_BUSH = DummyObjectProvider.createFor(ItemType.class, "ROSE_BUSH"); + + public static final ItemType ROSE_RED = DummyObjectProvider.createFor(ItemType.class, "ROSE_RED"); + public static final ItemType ROTTEN_FLESH = DummyObjectProvider.createFor(ItemType.class, "ROTTEN_FLESH"); public static final ItemType SADDLE = DummyObjectProvider.createFor(ItemType.class, "SADDLE"); + public static final ItemType SALMON = DummyObjectProvider.createFor(ItemType.class, "SALMON"); + + public static final ItemType SALMON_BUCKET = DummyObjectProvider.createFor(ItemType.class, "SALMON_BUCKET"); + + public static final ItemType SALMON_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SALMON_SPAWN_EGG"); + public static final ItemType SAND = DummyObjectProvider.createFor(ItemType.class, "SAND"); public static final ItemType SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "SANDSTONE"); + public static final ItemType SANDSTONE_SLAB = DummyObjectProvider.createFor(ItemType.class, "SANDSTONE_SLAB"); + public static final ItemType SANDSTONE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "SANDSTONE_STAIRS"); - public static final ItemType SAPLING = DummyObjectProvider.createFor(ItemType.class, "SAPLING"); + public static final ItemType SCUTE = DummyObjectProvider.createFor(ItemType.class, "SCUTE"); public static final ItemType SEA_LANTERN = DummyObjectProvider.createFor(ItemType.class, "SEA_LANTERN"); + public static final ItemType SEA_PICKLE = DummyObjectProvider.createFor(ItemType.class, "SEA_PICKLE"); + + public static final ItemType SEAGRASS = DummyObjectProvider.createFor(ItemType.class, "SEAGRASS"); + public static final ItemType SHEARS = DummyObjectProvider.createFor(ItemType.class, "SHEARS"); + public static final ItemType SHEEP_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SHEEP_SPAWN_EGG"); + public static final ItemType SHIELD = DummyObjectProvider.createFor(ItemType.class, "SHIELD"); + public static final ItemType SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "SHULKER_BOX"); + public static final ItemType SHULKER_SHELL = DummyObjectProvider.createFor(ItemType.class, "SHULKER_SHELL"); + public static final ItemType SHULKER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SHULKER_SPAWN_EGG"); + public static final ItemType SIGN = DummyObjectProvider.createFor(ItemType.class, "SIGN"); - /** - * This is also known as light gray glazed terracotta. - */ - public static final ItemType SILVER_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "SILVER_GLAZED_TERRACOTTA"); + public static final ItemType SILVERFISH_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SILVERFISH_SPAWN_EGG"); - /** - * This is also known as a light gray shulker box. - */ - public static final ItemType SILVER_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "SILVER_SHULKER_BOX"); + public static final ItemType SKELETON_HORSE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SKELETON_HORSE_SPAWN_EGG"); - public static final ItemType SKULL = DummyObjectProvider.createFor(ItemType.class, "SKULL"); + public static final ItemType SKELETON_SKULL = DummyObjectProvider.createFor(ItemType.class, "SKELETON_SKULL"); - public static final ItemType SLIME = DummyObjectProvider.createFor(ItemType.class, "SLIME"); + public static final ItemType SKELETON_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SKELETON_SPAWN_EGG"); public static final ItemType SLIME_BALL = DummyObjectProvider.createFor(ItemType.class, "SLIME_BALL"); + public static final ItemType SLIME_BLOCK = DummyObjectProvider.createFor(ItemType.class, "SLIME_BLOCK"); + + public static final ItemType SLIME_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SLIME_SPAWN_EGG"); + + public static final ItemType SMOOTH_QUARTZ = DummyObjectProvider.createFor(ItemType.class, "SMOOTH_QUARTZ"); + + public static final ItemType SMOOTH_RED_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "SMOOTH_RED_SANDSTONE"); + + public static final ItemType SMOOTH_SANDSTONE = DummyObjectProvider.createFor(ItemType.class, "SMOOTH_SANDSTONE"); + + public static final ItemType SMOOTH_STONE = DummyObjectProvider.createFor(ItemType.class, "SMOOTH_STONE"); + public static final ItemType SNOW = DummyObjectProvider.createFor(ItemType.class, "SNOW"); - public static final ItemType SNOWBALL = DummyObjectProvider.createFor(ItemType.class, "SNOWBALL"); + public static final ItemType SNOW_BLOCK = DummyObjectProvider.createFor(ItemType.class, "SNOW_BLOCK"); - public static final ItemType SNOW_LAYER = DummyObjectProvider.createFor(ItemType.class, "SNOW_LAYER"); + public static final ItemType SNOWBALL = DummyObjectProvider.createFor(ItemType.class, "SNOWBALL"); public static final ItemType SOUL_SAND = DummyObjectProvider.createFor(ItemType.class, "SOUL_SAND"); - public static final ItemType SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SPAWN_EGG"); - - public static final ItemType SPECKLED_MELON = DummyObjectProvider.createFor(ItemType.class, "SPECKLED_MELON"); + public static final ItemType SPAWNER = DummyObjectProvider.createFor(ItemType.class, "SPAWNER"); public static final ItemType SPECTRAL_ARROW = DummyObjectProvider.createFor(ItemType.class, "SPECTRAL_ARROW"); public static final ItemType SPIDER_EYE = DummyObjectProvider.createFor(ItemType.class, "SPIDER_EYE"); + public static final ItemType SPIDER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SPIDER_SPAWN_EGG"); + public static final ItemType SPLASH_POTION = DummyObjectProvider.createFor(ItemType.class, "SPLASH_POTION"); public static final ItemType SPONGE = DummyObjectProvider.createFor(ItemType.class, "SPONGE"); public static final ItemType SPRUCE_BOAT = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_BOAT"); + public static final ItemType SPRUCE_BUTTON = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_BUTTON"); + public static final ItemType SPRUCE_DOOR = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_DOOR"); public static final ItemType SPRUCE_FENCE = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_FENCE"); public static final ItemType SPRUCE_FENCE_GATE = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_FENCE_GATE"); + public static final ItemType SPRUCE_LEAVES = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_LEAVES"); + + public static final ItemType SPRUCE_LOG = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_LOG"); + + public static final ItemType SPRUCE_PLANKS = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_PLANKS"); + + public static final ItemType SPRUCE_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_PRESSURE_PLATE"); + + public static final ItemType SPRUCE_SAPLING = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_SAPLING"); + + public static final ItemType SPRUCE_SLAB = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_SLAB"); + public static final ItemType SPRUCE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_STAIRS"); - public static final ItemType STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "STAINED_GLASS"); + public static final ItemType SPRUCE_TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_TRAPDOOR"); - public static final ItemType STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "STAINED_GLASS_PANE"); + public static final ItemType SPRUCE_WOOD = DummyObjectProvider.createFor(ItemType.class, "SPRUCE_WOOD"); - /** - * This is also known as stained terracotta. - */ - public static final ItemType STAINED_HARDENED_CLAY = DummyObjectProvider.createFor(ItemType.class, "STAINED_HARDENED_CLAY"); + public static final ItemType SQUID_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "SQUID_SPAWN_EGG"); public static final ItemType STICK = DummyObjectProvider.createFor(ItemType.class, "STICK"); @@ -773,12 +1421,14 @@ public final class ItemTypes { public static final ItemType STONE = DummyObjectProvider.createFor(ItemType.class, "STONE"); - public static final ItemType STONEBRICK = DummyObjectProvider.createFor(ItemType.class, "STONEBRICK"); - public static final ItemType STONE_AXE = DummyObjectProvider.createFor(ItemType.class, "STONE_AXE"); + public static final ItemType STONE_BRICK_SLAB = DummyObjectProvider.createFor(ItemType.class, "STONE_BRICK_SLAB"); + public static final ItemType STONE_BRICK_STAIRS = DummyObjectProvider.createFor(ItemType.class, "STONE_BRICK_STAIRS"); + public static final ItemType STONE_BRICKS = DummyObjectProvider.createFor(ItemType.class, "STONE_BRICKS"); + public static final ItemType STONE_BUTTON = DummyObjectProvider.createFor(ItemType.class, "STONE_BUTTON"); public static final ItemType STONE_HOE = DummyObjectProvider.createFor(ItemType.class, "STONE_HOE"); @@ -791,21 +1441,49 @@ public final class ItemTypes { public static final ItemType STONE_SLAB = DummyObjectProvider.createFor(ItemType.class, "STONE_SLAB"); - public static final ItemType STONE_SLAB2 = DummyObjectProvider.createFor(ItemType.class, "STONE_SLAB2"); - - public static final ItemType STONE_STAIRS = DummyObjectProvider.createFor(ItemType.class, "STONE_STAIRS"); - public static final ItemType STONE_SWORD = DummyObjectProvider.createFor(ItemType.class, "STONE_SWORD"); + public static final ItemType STRAY_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "STRAY_SPAWN_EGG"); + public static final ItemType STRING = DummyObjectProvider.createFor(ItemType.class, "STRING"); + public static final ItemType STRIPPED_ACACIA_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_ACACIA_LOG"); + + public static final ItemType STRIPPED_ACACIA_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_ACACIA_WOOD"); + + public static final ItemType STRIPPED_BIRCH_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_BIRCH_LOG"); + + public static final ItemType STRIPPED_BIRCH_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_BIRCH_WOOD"); + + public static final ItemType STRIPPED_DARK_OAK_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_DARK_OAK_LOG"); + + public static final ItemType STRIPPED_DARK_OAK_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_DARK_OAK_WOOD"); + + public static final ItemType STRIPPED_JUNGLE_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_JUNGLE_LOG"); + + public static final ItemType STRIPPED_JUNGLE_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_JUNGLE_WOOD"); + + public static final ItemType STRIPPED_OAK_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_OAK_LOG"); + + public static final ItemType STRIPPED_OAK_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_OAK_WOOD"); + + public static final ItemType STRIPPED_SPRUCE_LOG = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_SPRUCE_LOG"); + + public static final ItemType STRIPPED_SPRUCE_WOOD = DummyObjectProvider.createFor(ItemType.class, "STRIPPED_SPRUCE_WOOD"); + public static final ItemType STRUCTURE_BLOCK = DummyObjectProvider.createFor(ItemType.class, "STRUCTURE_BLOCK"); public static final ItemType STRUCTURE_VOID = DummyObjectProvider.createFor(ItemType.class, "STRUCTURE_VOID"); public static final ItemType SUGAR = DummyObjectProvider.createFor(ItemType.class, "SUGAR"); - public static final ItemType TALLGRASS = DummyObjectProvider.createFor(ItemType.class, "TALLGRASS"); + public static final ItemType SUGAR_CANE = DummyObjectProvider.createFor(ItemType.class, "SUGAR_CANE"); + + public static final ItemType SUNFLOWER = DummyObjectProvider.createFor(ItemType.class, "SUNFLOWER"); + + public static final ItemType TALL_GRASS = DummyObjectProvider.createFor(ItemType.class, "TALL_GRASS"); + + public static final ItemType TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "TERRACOTTA"); public static final ItemType TIPPED_ARROW = DummyObjectProvider.createFor(ItemType.class, "TIPPED_ARROW"); @@ -817,58 +1495,124 @@ public final class ItemTypes { public static final ItemType TOTEM_OF_UNDYING = DummyObjectProvider.createFor(ItemType.class, "TOTEM_OF_UNDYING"); - public static final ItemType TRAPDOOR = DummyObjectProvider.createFor(ItemType.class, "TRAPDOOR"); - public static final ItemType TRAPPED_CHEST = DummyObjectProvider.createFor(ItemType.class, "TRAPPED_CHEST"); + public static final ItemType TRIDENT = DummyObjectProvider.createFor(ItemType.class, "TRIDENT"); + public static final ItemType TRIPWIRE_HOOK = DummyObjectProvider.createFor(ItemType.class, "TRIPWIRE_HOOK"); - public static final ItemType VINE = DummyObjectProvider.createFor(ItemType.class, "VINE"); + public static final ItemType TROPICAL_FISH = DummyObjectProvider.createFor(ItemType.class, "TROPICAL_FISH"); + + public static final ItemType TROPICAL_FISH_BUCKET = DummyObjectProvider.createFor(ItemType.class, "TROPICAL_FISH_BUCKET"); + + public static final ItemType TROPICAL_FISH_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "TROPICAL_FISH_SPAWN_EGG"); + + public static final ItemType TUBE_CORAL = DummyObjectProvider.createFor(ItemType.class, "TUBE_CORAL"); + + public static final ItemType TUBE_CORAL_BLOCK = DummyObjectProvider.createFor(ItemType.class, "TUBE_CORAL_BLOCK"); + + public static final ItemType TUBE_CORAL_FAN = DummyObjectProvider.createFor(ItemType.class, "TUBE_CORAL_FAN"); - public static final ItemType WATERLILY = DummyObjectProvider.createFor(ItemType.class, "WATERLILY"); + public static final ItemType TURTLE_EGG = DummyObjectProvider.createFor(ItemType.class, "TURTLE_EGG"); + + public static final ItemType TURTLE_HELMET = DummyObjectProvider.createFor(ItemType.class, "TURTLE_HELMET"); + + public static final ItemType TURTLE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "TURTLE_SPAWN_EGG"); + + public static final ItemType VEX_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "VEX_SPAWN_EGG"); + + public static final ItemType VILLAGER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "VILLAGER_SPAWN_EGG"); + + public static final ItemType VINDICATOR_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "VINDICATOR_SPAWN_EGG"); + + public static final ItemType VINE = DummyObjectProvider.createFor(ItemType.class, "VINE"); public static final ItemType WATER_BUCKET = DummyObjectProvider.createFor(ItemType.class, "WATER_BUCKET"); - public static final ItemType WEB = DummyObjectProvider.createFor(ItemType.class, "WEB"); + public static final ItemType WET_SPONGE = DummyObjectProvider.createFor(ItemType.class, "WET_SPONGE"); public static final ItemType WHEAT = DummyObjectProvider.createFor(ItemType.class, "WHEAT"); public static final ItemType WHEAT_SEEDS = DummyObjectProvider.createFor(ItemType.class, "WHEAT_SEEDS"); + public static final ItemType WHITE_BANNER = DummyObjectProvider.createFor(ItemType.class, "WHITE_BANNER"); + + public static final ItemType WHITE_BED = DummyObjectProvider.createFor(ItemType.class, "WHITE_BED"); + + public static final ItemType WHITE_CARPET = DummyObjectProvider.createFor(ItemType.class, "WHITE_CARPET"); + + public static final ItemType WHITE_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "WHITE_CONCRETE"); + + public static final ItemType WHITE_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "WHITE_CONCRETE_POWDER"); + public static final ItemType WHITE_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "WHITE_GLAZED_TERRACOTTA"); public static final ItemType WHITE_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "WHITE_SHULKER_BOX"); - public static final ItemType WOODEN_AXE = DummyObjectProvider.createFor(ItemType.class, "WOODEN_AXE"); + public static final ItemType WHITE_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "WHITE_STAINED_GLASS"); + + public static final ItemType WHITE_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "WHITE_STAINED_GLASS_PANE"); + + public static final ItemType WHITE_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "WHITE_TERRACOTTA"); - public static final ItemType WOODEN_BUTTON = DummyObjectProvider.createFor(ItemType.class, "WOODEN_BUTTON"); + public static final ItemType WHITE_TULIP = DummyObjectProvider.createFor(ItemType.class, "WHITE_TULIP"); - public static final ItemType WOODEN_DOOR = DummyObjectProvider.createFor(ItemType.class, "WOODEN_DOOR"); + public static final ItemType WHITE_WOOL = DummyObjectProvider.createFor(ItemType.class, "WHITE_WOOL"); + + public static final ItemType WITCH_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "WITCH_SPAWN_EGG"); + + public static final ItemType WITHER_SKELETON_SKULL = DummyObjectProvider.createFor(ItemType.class, "WITHER_SKELETON_SKULL"); + + public static final ItemType WITHER_SKELETON_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "WITHER_SKELETON_SPAWN_EGG"); + + public static final ItemType WOLF_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "WOLF_SPAWN_EGG"); + + public static final ItemType WOODEN_AXE = DummyObjectProvider.createFor(ItemType.class, "WOODEN_AXE"); public static final ItemType WOODEN_HOE = DummyObjectProvider.createFor(ItemType.class, "WOODEN_HOE"); public static final ItemType WOODEN_PICKAXE = DummyObjectProvider.createFor(ItemType.class, "WOODEN_PICKAXE"); - public static final ItemType WOODEN_PRESSURE_PLATE = DummyObjectProvider.createFor(ItemType.class, "WOODEN_PRESSURE_PLATE"); - public static final ItemType WOODEN_SHOVEL = DummyObjectProvider.createFor(ItemType.class, "WOODEN_SHOVEL"); - public static final ItemType WOODEN_SLAB = DummyObjectProvider.createFor(ItemType.class, "WOODEN_SLAB"); - public static final ItemType WOODEN_SWORD = DummyObjectProvider.createFor(ItemType.class, "WOODEN_SWORD"); - public static final ItemType WOOL = DummyObjectProvider.createFor(ItemType.class, "WOOL"); - public static final ItemType WRITABLE_BOOK = DummyObjectProvider.createFor(ItemType.class, "WRITABLE_BOOK"); public static final ItemType WRITTEN_BOOK = DummyObjectProvider.createFor(ItemType.class, "WRITTEN_BOOK"); - public static final ItemType YELLOW_FLOWER = DummyObjectProvider.createFor(ItemType.class, "YELLOW_FLOWER"); + public static final ItemType YELLOW_BANNER = DummyObjectProvider.createFor(ItemType.class, "YELLOW_BANNER"); + + public static final ItemType YELLOW_BED = DummyObjectProvider.createFor(ItemType.class, "YELLOW_BED"); + + public static final ItemType YELLOW_CARPET = DummyObjectProvider.createFor(ItemType.class, "YELLOW_CARPET"); + + public static final ItemType YELLOW_CONCRETE = DummyObjectProvider.createFor(ItemType.class, "YELLOW_CONCRETE"); + + public static final ItemType YELLOW_CONCRETE_POWDER = DummyObjectProvider.createFor(ItemType.class, "YELLOW_CONCRETE_POWDER"); public static final ItemType YELLOW_GLAZED_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "YELLOW_GLAZED_TERRACOTTA"); public static final ItemType YELLOW_SHULKER_BOX = DummyObjectProvider.createFor(ItemType.class, "YELLOW_SHULKER_BOX"); + public static final ItemType YELLOW_STAINED_GLASS = DummyObjectProvider.createFor(ItemType.class, "YELLOW_STAINED_GLASS"); + + public static final ItemType YELLOW_STAINED_GLASS_PANE = DummyObjectProvider.createFor(ItemType.class, "YELLOW_STAINED_GLASS_PANE"); + + public static final ItemType YELLOW_TERRACOTTA = DummyObjectProvider.createFor(ItemType.class, "YELLOW_TERRACOTTA"); + + public static final ItemType YELLOW_WOOL = DummyObjectProvider.createFor(ItemType.class, "YELLOW_WOOL"); + + public static final ItemType ZOMBIE_HEAD = DummyObjectProvider.createFor(ItemType.class, "ZOMBIE_HEAD"); + + public static final ItemType ZOMBIE_HORSE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ZOMBIE_HORSE_SPAWN_EGG"); + + public static final ItemType ZOMBIE_PIGMAN_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ZOMBIE_PIGMAN_SPAWN_EGG"); + + public static final ItemType ZOMBIE_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ZOMBIE_SPAWN_EGG"); + + public static final ItemType ZOMBIE_VILLAGER_SPAWN_EGG = DummyObjectProvider.createFor(ItemType.class, "ZOMBIE_VILLAGER_SPAWN_EGG"); + // SORTFIELDS:OFF // Suppress default constructor to ensure non-instantiability. diff --git a/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java b/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java index 50f7a9c14a8..8a78f0c62d6 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java +++ b/src/main/java/org/spongepowered/api/item/inventory/ItemStack.java @@ -85,7 +85,7 @@ static ItemStack of(ItemType itemType, int quantity) { * @return The empty ItemStack */ static ItemStack empty() { - return builder().itemType(ItemTypes.NONE).build(); + return builder().itemType(ItemTypes.AIR).build(); } /** diff --git a/src/main/java/org/spongepowered/api/util/Cycleable.java b/src/main/java/org/spongepowered/api/util/Cycleable.java index cfef8ccc7b0..0484714f986 100644 --- a/src/main/java/org/spongepowered/api/util/Cycleable.java +++ b/src/main/java/org/spongepowered/api/util/Cycleable.java @@ -26,7 +26,6 @@ import org.spongepowered.api.CatalogType; import org.spongepowered.api.block.BlockState; -import org.spongepowered.api.data.type.BrickType; import org.spongepowered.api.data.type.DyeColor; /** @@ -34,7 +33,7 @@ * {@link CatalogType}, that can be "cycled" for the "next" value. The uses are * varying, but usually related to cycling {@link BlockState}s. Note that * {@link Cycleable} is NOT intended to cycle between "types" that have - * no particular ordering, such as {@link DyeColor}, {@link BrickType}, etc. + * no particular ordering, such as {@link DyeColor}, etc. * due to their non-ordered nature. Applying an ordering on such types is not * recommended as there is no logic to a particular ordering, except that of * which they are registered. diff --git a/src/main/java/org/spongepowered/api/util/TypeTokens.java b/src/main/java/org/spongepowered/api/util/TypeTokens.java index 6a8b8b06d7c..d2341c1a71a 100644 --- a/src/main/java/org/spongepowered/api/util/TypeTokens.java +++ b/src/main/java/org/spongepowered/api/util/TypeTokens.java @@ -32,47 +32,27 @@ import org.spongepowered.api.data.DataSerializable; import org.spongepowered.api.data.meta.PatternLayer; import org.spongepowered.api.data.type.Art; -import org.spongepowered.api.data.type.BigMushroomType; import org.spongepowered.api.data.type.BodyPart; -import org.spongepowered.api.data.type.BrickType; import org.spongepowered.api.data.type.Career; -import org.spongepowered.api.data.type.CoalType; import org.spongepowered.api.data.type.ComparatorType; -import org.spongepowered.api.data.type.CookedFish; -import org.spongepowered.api.data.type.DirtType; -import org.spongepowered.api.data.type.DisguisedBlockType; -import org.spongepowered.api.data.type.DoublePlantType; import org.spongepowered.api.data.type.DyeColor; -import org.spongepowered.api.data.type.Fish; -import org.spongepowered.api.data.type.GoldenApple; import org.spongepowered.api.data.type.HandPreference; import org.spongepowered.api.data.type.Hinge; import org.spongepowered.api.data.type.HorseColor; import org.spongepowered.api.data.type.HorseStyle; import org.spongepowered.api.data.type.LlamaVariant; -import org.spongepowered.api.data.type.LogAxis; import org.spongepowered.api.data.type.NotePitch; import org.spongepowered.api.data.type.OcelotType; import org.spongepowered.api.data.type.ParrotVariant; import org.spongepowered.api.data.type.PickupRule; -import org.spongepowered.api.data.type.PistonType; -import org.spongepowered.api.data.type.PlantType; import org.spongepowered.api.data.type.PortionType; -import org.spongepowered.api.data.type.PrismarineType; import org.spongepowered.api.data.type.Profession; -import org.spongepowered.api.data.type.QuartzType; import org.spongepowered.api.data.type.RabbitType; import org.spongepowered.api.data.type.RailDirection; -import org.spongepowered.api.data.type.SandType; -import org.spongepowered.api.data.type.SandstoneType; -import org.spongepowered.api.data.type.ShrubType; -import org.spongepowered.api.data.type.SkullType; -import org.spongepowered.api.data.type.SlabType; +import org.spongepowered.api.data.type.SlabPortion; import org.spongepowered.api.data.type.StairShape; -import org.spongepowered.api.data.type.StoneType; import org.spongepowered.api.data.type.StructureMode; import org.spongepowered.api.data.type.TreeType; -import org.spongepowered.api.data.type.WallType; import org.spongepowered.api.data.type.WireAttachmentType; import org.spongepowered.api.data.value.mutable.ListValue; import org.spongepowered.api.data.value.mutable.MapValue; @@ -136,18 +116,10 @@ public final class TypeTokens { public static final TypeToken> BOUNDED_SHORT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken BRICK_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> BRICK_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken CAREER_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> CAREER_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken COAL_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> COAL_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken COLOR_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> COLOR_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -156,26 +128,10 @@ public final class TypeTokens { public static final TypeToken> COMPARATOR_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken COOKED_FISH_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> COOKED_FISH_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken DIRECTION_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> DIRECTION_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken DIRT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> DIRT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken DISGUISED_BLOCK_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> DISGUISED_BLOCK_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken DOUBLE_PLANT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> DOUBLE_PLANT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken DOUBLE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> DOUBLE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -196,10 +152,6 @@ public final class TypeTokens { public static final TypeToken> ENTITY_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken FISH_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> FISH_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken FLOAT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> FLOAT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -216,10 +168,6 @@ public final class TypeTokens { public static final TypeToken> GAME_PROFILE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken GOLDEN_APPLE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> GOLDEN_APPLE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken HAND_PREFERENCE_TYPE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> HAND_PREFERENCE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -280,10 +228,6 @@ public final class TypeTokens { public static final TypeToken> LLAMA_VARIANT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken LOG_AXIS_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> LOG_AXIS_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken LONG_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> LONG_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -300,10 +244,6 @@ public final class TypeTokens { public static final TypeToken> MAP_UUID_VECTOR3D_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken MUSHROOM_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> MUSHROOM_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken NOTE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> NOTE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -350,26 +290,10 @@ public final class TypeTokens { public static final TypeToken> PICKUP_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken PISTON_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> PISTON_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken PLANT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> PLANT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken PORTION_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> PORTION_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken PRISMARINE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> PRISMARINE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken QUARTZ_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> QUARTZ_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken RABBIT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> RABBIT_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -382,14 +306,6 @@ public final class TypeTokens { public static final TypeToken> ROTATION_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken SAND_STONE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> SAND_STONE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken SAND_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> SAND_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken> SET_BLOCK_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; public static final TypeToken> SET_BLOCK_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -404,17 +320,9 @@ public final class TypeTokens { public static final TypeToken SHORT_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - public static final TypeToken SHRUB_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> SHRUB_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken SKULL_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> SKULL_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; + public static final TypeToken SLAB_PORTION_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - public static final TypeToken SLAB_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> SLAB_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; + public static final TypeToken> SLAB_PORTION_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; public static final TypeToken STAIR_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; @@ -424,10 +332,6 @@ public final class TypeTokens { public static final TypeToken> STATISTIC_MAP_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken STONE_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> STONE_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken STRING_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; public static final TypeToken> STRING_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; @@ -456,11 +360,7 @@ public final class TypeTokens { public static final TypeToken> VECTOR_3I_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - public static final TypeToken WALL_TOKEN = new TypeToken() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> WALL_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; - - public static final TypeToken> WEIGHTED_ENTITY_ARCHETYPE_COLLECTION_VALUE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; + public static final TypeToken> WEIGHTED_ENTITY_ARCHETYPE_COLLECTION_VALUE_TOKEN = new TypeToken> () {private static final long serialVersionUID = -1;}; public static final TypeToken> WEIGHTED_ENTITY_ARCHETYPE_TABLE_TOKEN = new TypeToken>() {private static final long serialVersionUID = -1;}; diff --git a/src/main/java/org/spongepowered/api/world/gen/populator/DoublePlant.java b/src/main/java/org/spongepowered/api/world/gen/populator/DoublePlant.java index e61c7f57db7..da560ef5f5a 100644 --- a/src/main/java/org/spongepowered/api/world/gen/populator/DoublePlant.java +++ b/src/main/java/org/spongepowered/api/world/gen/populator/DoublePlant.java @@ -25,7 +25,7 @@ package org.spongepowered.api.world.gen.populator; import org.spongepowered.api.Sponge; -import org.spongepowered.api.data.type.DoublePlantType; +import org.spongepowered.api.block.BlockType; import org.spongepowered.api.util.ResettableBuilder; import org.spongepowered.api.util.weighted.VariableAmount; import org.spongepowered.api.util.weighted.WeightedTable; @@ -43,6 +43,7 @@ * plants. The number of plants attempted to be generated is * {@code final = base + [0,variance) }. */ +// TODO: Add property to check if it's a double plant and reference here public interface DoublePlant extends Populator { /** @@ -60,7 +61,7 @@ static Builder builder() { * * @return The possible types to be spawned */ - WeightedTable getPossibleTypes(); + WeightedTable getPossibleTypes(); /** * Gets the number of plants to create per chunk. @@ -100,7 +101,7 @@ default void setPlantsPerChunk(int count) { * * @return The supplier override */ - Optional, DoublePlantType>> getSupplierOverride(); + Optional, BlockType>> getSupplierOverride(); /** * Sets the overriding supplier. If the supplier is present then it is used @@ -109,7 +110,7 @@ default void setPlantsPerChunk(int count) { * * @param override The new supplier override, or null */ - void setSupplierOverride(@Nullable Function, DoublePlantType> override); + void setSupplierOverride(@Nullable Function, BlockType> override); /** * Clears the supplier override to force the weighted table to be used @@ -130,7 +131,7 @@ interface Builder extends ResettableBuilder { * @param types Possible types * @return This builder, for chaining */ - Builder types(WeightedTable types); + Builder types(WeightedTable types); /** * Adds a plant type to the list that may be spawned in by this @@ -140,7 +141,7 @@ interface Builder extends ResettableBuilder { * @param weight The weight * @return This builder, for chaining */ - Builder type(DoublePlantType type, double weight); + Builder type(BlockType type, double weight); /** * Sets the number of plants to create, cannot be negative. @@ -175,7 +176,7 @@ default Builder perChunk(int count) { * @param override The new supplier override, or null * @return This builder, for chaining */ - Builder supplier(@Nullable Function, DoublePlantType> override); + Builder supplier(@Nullable Function, BlockType> override); /** * Builds a new instance of a {@link DoublePlant} populator with the diff --git a/src/main/java/org/spongepowered/api/world/gen/populator/Flower.java b/src/main/java/org/spongepowered/api/world/gen/populator/Plant.java similarity index 78% rename from src/main/java/org/spongepowered/api/world/gen/populator/Flower.java rename to src/main/java/org/spongepowered/api/world/gen/populator/Plant.java index d689b1b5436..f1e66d139e6 100644 --- a/src/main/java/org/spongepowered/api/world/gen/populator/Flower.java +++ b/src/main/java/org/spongepowered/api/world/gen/populator/Plant.java @@ -25,7 +25,7 @@ package org.spongepowered.api.world.gen.populator; import org.spongepowered.api.Sponge; -import org.spongepowered.api.data.type.PlantType; +import org.spongepowered.api.block.BlockType; import org.spongepowered.api.util.ResettableBuilder; import org.spongepowered.api.util.weighted.VariableAmount; import org.spongepowered.api.util.weighted.WeightedTable; @@ -39,12 +39,12 @@ import javax.annotation.Nullable; /** - * Represents a populator which scatters flowers randomly around a chunk. + * Represents a populator which scatters plants randomly around a chunk. */ -public interface Flower extends Populator { +public interface Plant extends Populator { /** - * Creates a new {@link Builder} to build a {@link Flower} populator. + * Creates a new {@link Builder} to build a {@link Plant} populator. * * @return The new builder */ @@ -53,27 +53,27 @@ static Builder builder() { } /** - * Gets the number of flowers to attempt to spawn per chunk, must be greater + * Gets the number of plants to attempt to spawn per chunk, must be greater * than zero. * * @return The number to spawn */ - VariableAmount getFlowersPerChunk(); + VariableAmount getPlantsPerChunk(); /** - * Sets the number of flowers to attempt to spawn per chunk, must be greater + * Sets the number of plants to attempt to spawn per chunk, must be greater * than zero. * *

Note: This number is not a definite number and the - * final count of flowers which are successfully spawned by the populator + * final count of plants which are successfully spawned by the populator * will almost always be lower.

* * @param count The new amount to spawn */ - void setFlowersPerChunk(VariableAmount count); + void setPlantsPerChunk(VariableAmount count); /** - * Sets the number of flowers to attempt to spawn per chunk, must be greater + * Sets the number of plants to attempt to spawn per chunk, must be greater * than zero. * *

Note: This number is not a definite number and the @@ -82,8 +82,8 @@ static Builder builder() { * * @param count The new amount to spawn */ - default void setFlowersPerChunk(int count) { - setFlowersPerChunk(VariableAmount.fixed(count)); + default void setPlantsPerChunk(int count) { + setPlantsPerChunk(VariableAmount.fixed(count)); } /** @@ -92,24 +92,24 @@ default void setFlowersPerChunk(int count) { * * @return The plant types */ - WeightedTable getFlowerTypes(); + WeightedTable getPlantTypes(); /** * Gets the overriding supplier if it exists. If the supplier is present * then it is used in place of the weighted table while determining what - * PlantType to place. + * plant to place. * * @return The supplier override */ - Optional, PlantType>> getSupplierOverride(); + Optional, BlockType>> getSupplierOverride(); /** * Sets the overriding supplier. If the supplier is present then it is used - * in place of the weighted table while determining what PlantType to place. + * in place of the weighted table while determining what plant to place. * * @param override The new supplier override, or null */ - void setSupplierOverride(@Nullable Function, PlantType> override); + void setSupplierOverride(@Nullable Function, BlockType> override); /** * Clears the supplier override to force the weighted table to be used @@ -120,9 +120,9 @@ default void clearSupplierOverride() { } /** - * A builder for constructing {@link Flower} populators. + * A builder for constructing {@link Plant} populators. */ - interface Builder extends ResettableBuilder { + interface Builder extends ResettableBuilder { /** * Sets the number of flowers to attempt to spawn per chunk, must be @@ -158,7 +158,7 @@ default Builder perChunk(int count) { * @param types The plant types to spawn * @return This builder, for chaining */ - Builder types(WeightedTable types); + Builder types(WeightedTable types); /** * Adds the plant type to the list of types to spawn with the given @@ -168,7 +168,7 @@ default Builder perChunk(int count) { * @param weight The weight of the type * @return This builder, for chaining */ - Builder type(PlantType type, double weight); + Builder type(BlockType type, double weight); /** * Sets the overriding supplier. If the supplier is present then it is @@ -177,17 +177,17 @@ default Builder perChunk(int count) { * @param override The new supplier override, or null * @return This builder, for chaining */ - Builder supplier(Function, PlantType> override); + Builder supplier(Function, BlockType> override); /** - * Builds a new instance of a {@link Flower} populator with the settings + * Builds a new instance of a {@link Plant} populator with the settings * set within the builder. * * @return A new instance of the populator * @throws IllegalStateException If there are any settings left unset * which do not have default values */ - Flower build() throws IllegalStateException; + Plant build() throws IllegalStateException; } diff --git a/src/main/java/org/spongepowered/api/world/gen/populator/Shrub.java b/src/main/java/org/spongepowered/api/world/gen/populator/Shrub.java deleted file mode 100644 index 938bc024f4e..00000000000 --- a/src/main/java/org/spongepowered/api/world/gen/populator/Shrub.java +++ /dev/null @@ -1,177 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.world.gen.populator; - -import org.spongepowered.api.Sponge; -import org.spongepowered.api.data.type.ShrubType; -import org.spongepowered.api.util.ResettableBuilder; -import org.spongepowered.api.util.weighted.VariableAmount; -import org.spongepowered.api.util.weighted.WeightedTable; -import org.spongepowered.api.world.Location; -import org.spongepowered.api.world.extent.Extent; -import org.spongepowered.api.world.gen.Populator; - -import java.util.Optional; -import java.util.function.Function; - -import javax.annotation.Nullable; - -/** - * Represents a populator which places down various variants of - * {@link ShrubType}s within the chunk. - */ -public interface Shrub extends Populator { - - /** - * Creates a new {@link Builder} to build a {@link Shrub} populator. - * - * @return The new builder - */ - static Builder builder() { - return Sponge.getRegistry().createBuilder(Builder.class); - } - - /** - * Gets a weighted collection of {@link ShrubType}s to place. - * - * @return The shrub types - */ - WeightedTable getTypes(); - - /** - * Gets the number of shrubs to attempt to spawn per chunk, must be greater - * than zero. - * - * @return The amount of shrubs to spawn - */ - VariableAmount getShrubsPerChunk(); - - /** - * Sets the number of shrubs to attempt to spawn per chunk, must be greater - * than zero. - * - * @param count The new amount of shrubs to spawn - */ - void setShrubsPerChunk(VariableAmount count); - - /** - * Sets the number of shrubs to attempt to spawn per chunk, must be greater - * than zero. - * - * @param count The new amount of shrubs to spawn - */ - default void setShrubsPerChunk(int count) { - setShrubsPerChunk(VariableAmount.fixed(count)); - } - - /** - * Gets the overriding supplier if it exists. If the supplier is present - * then it is used in place of the weighted table while determining what - * ShrubType to place. - * - * @return The supplier override - */ - Optional, ShrubType>> getSupplierOverride(); - - /** - * Sets the overriding supplier. If the supplier is present then it is used - * in place of the weighted table while determining what ShrubType to place. - * - * @param override The new supplier override, or null - */ - void setSupplierOverride(@Nullable Function, ShrubType> override); - - /** - * Clears the supplier override to force the weighted table to be used - * instead. - */ - default void clearSupplierOverride() { - setSupplierOverride(null); - } - - /** - * A builder for constructing {@link Shrub} populators. - */ - interface Builder extends ResettableBuilder { - - /** - * Sets the number of shrubs to attempt to spawn per chunk, must be - * greater than zero. - * - * @param count The new amount of shrubs to spawn - * @return This builder, for chaining - */ - Builder perChunk(VariableAmount count); - - /** - * Sets the number of shrubs to attempt to spawn per chunk, must be - * greater than zero. - * - * @param count The new amount of shrubs to spawn - * @return This builder, for chaining - */ - default Builder perChunk(int count) { - return perChunk(VariableAmount.fixed(count)); - } - - /** - * Sets the weighted {@link ShrubType}s to place. - * - * @param types The new shrub types - * @return This builder, for chaining - */ - Builder types(WeightedTable types); - - /** - * Adds the weighted {@link ShrubType}s to the list of types. - * - * @param type The new shrub type - * @param weight The weight of the type - * @return This builder, for chaining - */ - Builder type(ShrubType type, int weight); - - /** - * Sets the overriding supplier. If the supplier is present then it is - * used in place of the weighted table. - * - * @param override The new supplier override, or null - * @return This builder, for chaining - */ - Builder supplier(@Nullable Function, ShrubType> override); - - /** - * Builds a new instance of a {@link Shrub} populator with the settings - * set within the builder. - * - * @return A new instance of the populator - * @throws IllegalStateException If there are any settings left unset - * which do not have default values - */ - Shrub build() throws IllegalStateException; - - } - -} From d968361aaaacfdb6f0ec4391a5298a171e0aef41 Mon Sep 17 00:00:00 2001 From: Seppe Volkaerts Date: Thu, 20 Sep 2018 22:02:06 +0200 Subject: [PATCH 2/2] Rename SILVER DyeColor to LIGHT_GRAY. --- src/main/java/org/spongepowered/api/data/type/DyeColors.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/spongepowered/api/data/type/DyeColors.java b/src/main/java/org/spongepowered/api/data/type/DyeColors.java index 1161ad2f69c..c816e2e1d65 100644 --- a/src/main/java/org/spongepowered/api/data/type/DyeColors.java +++ b/src/main/java/org/spongepowered/api/data/type/DyeColors.java @@ -47,6 +47,8 @@ public final class DyeColors { public static final DyeColor LIGHT_BLUE = DummyObjectProvider.createFor(DyeColor.class, "LIGHT_BLUE"); + public static final DyeColor LIGHT_GRAY = DummyObjectProvider.createFor(DyeColor.class, "LIGHT_GRAY"); + public static final DyeColor LIME = DummyObjectProvider.createFor(DyeColor.class, "LIME"); public static final DyeColor MAGENTA = DummyObjectProvider.createFor(DyeColor.class, "MAGENTA"); @@ -59,8 +61,6 @@ public final class DyeColors { public static final DyeColor RED = DummyObjectProvider.createFor(DyeColor.class, "RED"); - public static final DyeColor SILVER = DummyObjectProvider.createFor(DyeColor.class, "SILVER"); - public static final DyeColor WHITE = DummyObjectProvider.createFor(DyeColor.class, "WHITE"); public static final DyeColor YELLOW = DummyObjectProvider.createFor(DyeColor.class, "YELLOW");