From 81000c3284851ae3602bbcb336b7125eb60556b7 Mon Sep 17 00:00:00 2001 From: Nightenom <17338378+Nightenom@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:52:22 +0200 Subject: [PATCH] Review --- .../minecolonies/api/blocks/ModBlocks.java | 161 ++++++++-------- .../buildings/registry/BuildingEntry.java | 3 +- .../com/minecolonies/api/items/ModItems.java | 172 +++++++----------- .../initializer/TileEntityInitializer.java | 36 ++-- 4 files changed, 169 insertions(+), 203 deletions(-) diff --git a/src/main/java/com/minecolonies/api/blocks/ModBlocks.java b/src/main/java/com/minecolonies/api/blocks/ModBlocks.java index da18593d210..4d1a7f34004 100755 --- a/src/main/java/com/minecolonies/api/blocks/ModBlocks.java +++ b/src/main/java/com/minecolonies/api/blocks/ModBlocks.java @@ -38,95 +38,95 @@ public final class ModBlocks * Creating objects for all blocks in the mod. * References can be made to here. */ - public static final DeferredBlock blockHutTownHall = simpleBlockItem("blockhuttownhall", BlockHutTownHall::new); - public static final DeferredBlock blockHutHome = simpleBlockItem("blockhutcitizen", BlockHutCitizen::new); - public static final DeferredBlock blockHutMiner = simpleBlockItem("blockhutminer", BlockHutMiner::new); - public static final DeferredBlock blockHutLumberjack = simpleBlockItem("blockhutlumberjack", BlockHutLumberjack::new); - public static final DeferredBlock blockHutBaker = simpleBlockItem("blockhutbaker", BlockHutBaker::new); - public static final DeferredBlock blockHutBuilder = simpleBlockItem("blockhutbuilder", BlockHutBuilder::new); - public static final DeferredBlock blockHutDeliveryman = simpleBlockItem("blockhutdeliveryman", BlockHutDeliveryman::new); - public static final DeferredBlock blockHutBlacksmith = simpleBlockItem("blockhutblacksmith", BlockHutBlacksmith::new); - public static final DeferredBlock blockHutStonemason = simpleBlockItem("blockhutstonemason", BlockHutStonemason::new); - public static final DeferredBlock blockHutFarmer = simpleBlockItem("blockhutfarmer", BlockHutFarmer::new); - public static final DeferredBlock blockHutFisherman = simpleBlockItem("blockhutfisherman", BlockHutFisherman::new); - public static final DeferredBlock blockHutGuardTower = simpleBlockItem("blockhutguardtower", BlockHutGuardTower::new); - public static final DeferredBlock blockHutWareHouse = simpleBlockItem("blockhutwarehouse", BlockHutWareHouse::new); - public static final DeferredBlock blockHutShepherd = simpleBlockItem("blockhutshepherd", BlockHutShepherd::new); - public static final DeferredBlock blockHutCowboy = simpleBlockItem("blockhutcowboy", BlockHutCowboy::new); - public static final DeferredBlock blockHutSwineHerder = simpleBlockItem("blockhutswineherder", BlockHutSwineHerder::new); + public static final DeferredBlock blockHutTownHall = simpleBlockItem("blockhuttownhall", BlockHutTownHall::new); + public static final DeferredBlock blockHutHome = simpleBlockItem("blockhutcitizen", BlockHutCitizen::new); + public static final DeferredBlock blockHutMiner = simpleBlockItem("blockhutminer", BlockHutMiner::new); + public static final DeferredBlock blockHutLumberjack = simpleBlockItem("blockhutlumberjack", BlockHutLumberjack::new); + public static final DeferredBlock blockHutBaker = simpleBlockItem("blockhutbaker", BlockHutBaker::new); + public static final DeferredBlock blockHutBuilder = simpleBlockItem("blockhutbuilder", BlockHutBuilder::new); + public static final DeferredBlock blockHutDeliveryman = simpleBlockItem("blockhutdeliveryman", BlockHutDeliveryman::new); + public static final DeferredBlock blockHutBlacksmith = simpleBlockItem("blockhutblacksmith", BlockHutBlacksmith::new); + public static final DeferredBlock blockHutStonemason = simpleBlockItem("blockhutstonemason", BlockHutStonemason::new); + public static final DeferredBlock blockHutFarmer = simpleBlockItem("blockhutfarmer", BlockHutFarmer::new); + public static final DeferredBlock blockHutFisherman = simpleBlockItem("blockhutfisherman", BlockHutFisherman::new); + public static final DeferredBlock blockHutGuardTower = simpleBlockItem("blockhutguardtower", BlockHutGuardTower::new); + public static final DeferredBlock blockHutWareHouse = simpleBlockItem("blockhutwarehouse", BlockHutWareHouse::new); + public static final DeferredBlock blockHutShepherd = simpleBlockItem("blockhutshepherd", BlockHutShepherd::new); + public static final DeferredBlock blockHutCowboy = simpleBlockItem("blockhutcowboy", BlockHutCowboy::new); + public static final DeferredBlock blockHutSwineHerder = simpleBlockItem("blockhutswineherder", BlockHutSwineHerder::new); public static final DeferredBlock blockHutChickenHerder = simpleBlockItem("blockhutchickenherder", BlockHutChickenHerder::new); - public static final DeferredBlock blockHutBarracks = simpleBlockItem("blockhutbarracks", BlockHutBarracks::new); + public static final DeferredBlock blockHutBarracks = simpleBlockItem("blockhutbarracks", BlockHutBarracks::new); public static final DeferredBlock blockHutBarracksTower = simpleBlockItem("blockhutbarrackstower", BlockHutBarracksTower::new); - public static final DeferredBlock blockHutCook = simpleBlockItem("blockhutcook", BlockHutCook::new); - public static final DeferredBlock blockHutSmeltery = simpleBlockItem("blockhutsmeltery", BlockHutSmeltery::new); - public static final DeferredBlock blockHutComposter = simpleBlockItem("blockhutcomposter", BlockHutComposter::new); - public static final DeferredBlock blockHutLibrary = simpleBlockItem("blockhutlibrary", BlockHutLibrary::new); - public static final DeferredBlock blockHutArchery = simpleBlockItem("blockhutarchery", BlockHutArchery::new); + public static final DeferredBlock blockHutCook = simpleBlockItem("blockhutcook", BlockHutCook::new); + public static final DeferredBlock blockHutSmeltery = simpleBlockItem("blockhutsmeltery", BlockHutSmeltery::new); + public static final DeferredBlock blockHutComposter = simpleBlockItem("blockhutcomposter", BlockHutComposter::new); + public static final DeferredBlock blockHutLibrary = simpleBlockItem("blockhutlibrary", BlockHutLibrary::new); + public static final DeferredBlock blockHutArchery = simpleBlockItem("blockhutarchery", BlockHutArchery::new); public static final DeferredBlock blockHutCombatAcademy = simpleBlockItem("blockhutcombatacademy", BlockHutCombatAcademy::new); - public static final DeferredBlock blockHutSawmill = simpleBlockItem("blockhutsawmill", BlockHutSawmill::new); + public static final DeferredBlock blockHutSawmill = simpleBlockItem("blockhutsawmill", BlockHutSawmill::new); public static final DeferredBlock blockHutStoneSmeltery = simpleBlockItem("blockhutstonesmeltery", BlockHutStoneSmeltery::new); - public static final DeferredBlock blockHutCrusher = simpleBlockItem("blockhutcrusher", BlockHutCrusher::new); - public static final DeferredBlock blockHutSifter = simpleBlockItem("blockhutsifter", BlockHutSifter::new); - public static final DeferredBlock blockPostBox = simpleBlockItem("blockpostbox", BlockPostBox::new); - public static final DeferredBlock blockHutFlorist = simpleBlockItem("blockhutflorist", BlockHutFlorist::new); - public static final DeferredBlock blockHutEnchanter = simpleBlockItem("blockhutenchanter", BlockHutEnchanter::new); - public static final DeferredBlock blockHutUniversity = simpleBlockItem("blockhutuniversity", BlockHutUniversity::new); - public static final DeferredBlock blockHutHospital = simpleBlockItem("blockhuthospital", BlockHutHospital::new); - public static final DeferredBlock blockStash = simpleBlockItem("blockstash", BlockStash::new); - public static final DeferredBlock blockHutSchool = simpleBlockItem("blockhutschool", BlockHutSchool::new); - public static final DeferredBlock blockHutGlassblower = simpleBlockItem("blockhutglassblower", BlockHutGlassblower::new); - public static final DeferredBlock blockHutDyer = simpleBlockItem("blockhutdyer", BlockHutDyer::new); - public static final DeferredBlock blockHutFletcher = simpleBlockItem("blockhutfletcher", BlockHutFletcher::new); - public static final DeferredBlock blockHutMechanic = simpleBlockItem("blockhutmechanic", BlockHutMechanic::new); - public static final DeferredBlock blockHutPlantation = simpleBlockItem("blockhutplantation", BlockHutPlantation::new); - public static final DeferredBlock blockHutTavern = simpleBlockItem("blockhuttavern", BlockHutTavern::new); - public static final DeferredBlock blockHutRabbitHutch = simpleBlockItem("blockhutrabbithutch", BlockHutRabbitHutch::new); + public static final DeferredBlock blockHutCrusher = simpleBlockItem("blockhutcrusher", BlockHutCrusher::new); + public static final DeferredBlock blockHutSifter = simpleBlockItem("blockhutsifter", BlockHutSifter::new); + public static final DeferredBlock blockPostBox = simpleBlockItem("blockpostbox", BlockPostBox::new); + public static final DeferredBlock blockHutFlorist = simpleBlockItem("blockhutflorist", BlockHutFlorist::new); + public static final DeferredBlock blockHutEnchanter = simpleBlockItem("blockhutenchanter", BlockHutEnchanter::new); + public static final DeferredBlock blockHutUniversity = simpleBlockItem("blockhutuniversity", BlockHutUniversity::new); + public static final DeferredBlock blockHutHospital = simpleBlockItem("blockhuthospital", BlockHutHospital::new); + public static final DeferredBlock blockStash = simpleBlockItem("blockstash", BlockStash::new); + public static final DeferredBlock blockHutSchool = simpleBlockItem("blockhutschool", BlockHutSchool::new); + public static final DeferredBlock blockHutGlassblower = simpleBlockItem("blockhutglassblower", BlockHutGlassblower::new); + public static final DeferredBlock blockHutDyer = simpleBlockItem("blockhutdyer", BlockHutDyer::new); + public static final DeferredBlock blockHutFletcher = simpleBlockItem("blockhutfletcher", BlockHutFletcher::new); + public static final DeferredBlock blockHutMechanic = simpleBlockItem("blockhutmechanic", BlockHutMechanic::new); + public static final DeferredBlock blockHutPlantation = simpleBlockItem("blockhutplantation", BlockHutPlantation::new); + public static final DeferredBlock blockHutTavern = simpleBlockItem("blockhuttavern", BlockHutTavern::new); + public static final DeferredBlock blockHutRabbitHutch = simpleBlockItem("blockhutrabbithutch", BlockHutRabbitHutch::new); public static final DeferredBlock blockHutConcreteMixer = simpleBlockItem("blockhutconcretemixer", BlockHutConcreteMixer::new); - public static final DeferredBlock blockHutBeekeeper = simpleBlockItem("blockhutbeekeeper", BlockHutBeekeeper::new); - public static final DeferredBlock blockHutMysticalSite = simpleBlockItem("blockhutmysticalsite", BlockHutMysticalSite::new); - public static final DeferredBlock blockHutGraveyard = simpleBlockItem("blockhutgraveyard", BlockHutGraveyard::new); - public static final DeferredBlock blockHutNetherWorker = simpleBlockItem("blockhutnetherworker", BlockHutNetherWorker::new); - public static final DeferredBlock blockSimpleQuarry = simpleBlockItem(ModBuildings.SIMPLE_QUARRY_ID, SimpleQuarry::new); - public static final DeferredBlock blockMediumQuarry = simpleBlockItem(ModBuildings.MEDIUM_QUARRY_ID, MediumQuarry::new); - //public static final DeferredBlock blockLargeQuarry = simpleBlockItem("largequarry", LargeQuarry::new); - public static final DeferredBlock blockHutAlchemist = simpleBlockItem("blockhutalchemist", BlockHutAlchemist::new); - public static final DeferredBlock blockHutKitchen = simpleBlockItem("blockhutkitchen", BlockHutKitchen::new); + public static final DeferredBlock blockHutBeekeeper = simpleBlockItem("blockhutbeekeeper", BlockHutBeekeeper::new); + public static final DeferredBlock blockHutMysticalSite = simpleBlockItem("blockhutmysticalsite", BlockHutMysticalSite::new); + public static final DeferredBlock blockHutGraveyard = simpleBlockItem("blockhutgraveyard", BlockHutGraveyard::new); + public static final DeferredBlock blockHutNetherWorker = simpleBlockItem("blockhutnetherworker", BlockHutNetherWorker::new); + public static final DeferredBlock blockSimpleQuarry = simpleBlockItem(ModBuildings.SIMPLE_QUARRY_ID, SimpleQuarry::new); + public static final DeferredBlock blockMediumQuarry = simpleBlockItem(ModBuildings.MEDIUM_QUARRY_ID, MediumQuarry::new); + //public static final DeferredBlock blockLargeQuarry = simpleBlockItem("largequarry", LargeQuarry::new); + public static final DeferredBlock blockHutAlchemist = simpleBlockItem("blockhutalchemist", BlockHutAlchemist::new); + public static final DeferredBlock blockHutKitchen = simpleBlockItem("blockhutkitchen", BlockHutKitchen::new); /** * Utility blocks. */ - public static final DeferredBlock blockConstructionTape = simpleBlockItem("blockconstructiontape", BlockConstructionTape::new); - public static final DeferredBlock blockRack = simpleBlockItem("blockminecoloniesrack", BlockMinecoloniesRack::new); - public static final DeferredBlock blockGrave = simpleBlockItem("blockminecoloniesgrave", BlockMinecoloniesGrave::new); - public static final DeferredBlock blockNamedGrave = simpleBlockItem("blockminecoloniesnamedgrave", BlockMinecoloniesNamedGrave::new); - public static final DeferredBlock blockWayPoint = simpleBlockItem("blockwaypoint", BlockWaypoint::new); - public static final DeferredBlock blockBarrel = simpleBlockItem("barrel_block", BlockBarrel::new); - public static final DeferredBlock blockDecorationPlaceholder = simpleBlockItem("decorationcontroller", BlockDecorationController::new); - public static final DeferredBlock blockScarecrow = simpleBlockItem("blockhutfield", BlockScarecrow::new); - public static final DeferredBlock blockPlantationField = simpleBlockItem("blockhutplantationfield", BlockPlantationField::new); - public static final DeferredBlock blockCompostedDirt = simpleBlockItem("composted_dirt", BlockCompostedDirt::new); - public static final DeferredBlock farmland = simpleBlockItem("farmland", () -> new MinecoloniesFarmland(false, 15.0)); - public static final DeferredBlock floodedFarmland = simpleBlockItem("floodedfarmland", () -> new MinecoloniesFarmland(true, 13.0)); - - public static final DeferredBlock blockIronGate = customBlockItem("gate_iron", () -> new BlockGate(5f, 6, 8), ItemGate::new); + public static final DeferredBlock blockConstructionTape = simpleBlockItem("blockconstructiontape", BlockConstructionTape::new); + public static final DeferredBlock blockRack = simpleBlockItem("blockminecoloniesrack", BlockMinecoloniesRack::new); + public static final DeferredBlock blockGrave = simpleBlockItem("blockminecoloniesgrave", BlockMinecoloniesGrave::new); + public static final DeferredBlock blockNamedGrave = simpleBlockItem("blockminecoloniesnamedgrave", BlockMinecoloniesNamedGrave::new); + public static final DeferredBlock blockWayPoint = simpleBlockItem("blockwaypoint", BlockWaypoint::new); + public static final DeferredBlock blockBarrel = simpleBlockItem("barrel_block", BlockBarrel::new); + public static final DeferredBlock blockDecorationPlaceholder = simpleBlockItem("decorationcontroller", BlockDecorationController::new); + public static final DeferredBlock blockScarecrow = simpleBlockItem("blockhutfield", BlockScarecrow::new); + public static final DeferredBlock blockPlantationField = simpleBlockItem("blockhutplantationfield", BlockPlantationField::new); + public static final DeferredBlock blockCompostedDirt = simpleBlockItem("composted_dirt", BlockCompostedDirt::new); + public static final DeferredBlock farmland = simpleBlockItem("farmland", () -> new MinecoloniesFarmland(false, 15.0)); + public static final DeferredBlock floodedFarmland = simpleBlockItem("floodedfarmland", () -> new MinecoloniesFarmland(true, 13.0)); + + public static final DeferredBlock blockIronGate = customBlockItem("gate_iron", () -> new BlockGate(5f, 6, 8), ItemGate::new); public static final DeferredBlock blockWoodenGate = customBlockItem("gate_wood", () -> new BlockGate(4f, 6, 5), ItemGate::new); /** * Items in ModItems */ - public static final DeferredBlock blockColonyBanner = simple("colony_banner", BlockColonyFlagBanner::new); + public static final DeferredBlock blockColonyBanner = simple("colony_banner", BlockColonyFlagBanner::new); public static final DeferredBlock blockColonyWallBanner = simple("colony_wall_banner", BlockColonyFlagWallBanner::new); public static final DeferredBlock blockBellPepper = cropBlock("bell_pepper", ModBlocks.farmland, ModTags.temperateBiomes); - public static final DeferredBlock blockCabbage = cropBlock("cabbage", ModBlocks.farmland, ModTags.coldBiomes); - public static final DeferredBlock blockChickpea = cropBlock("chickpea", ModBlocks.farmland, ModTags.dryBiomes); - public static final DeferredBlock blockDurum = cropBlock("durum", ModBlocks.farmland, null); - public static final DeferredBlock blockEggplant = cropBlock("eggplant", ModBlocks.farmland, null); - public static final DeferredBlock blockGarlic = cropBlock("garlic", ModBlocks.farmland, null); - public static final DeferredBlock blockOnion = cropBlock("onion", ModBlocks.farmland, null); - public static final DeferredBlock blockSoyBean = cropBlock("soybean", ModBlocks.farmland, ModTags.humidBiomes); - public static final DeferredBlock blockTomato = cropBlock("tomato", ModBlocks.farmland, ModTags.temperateBiomes); - public static final DeferredBlock blockRice = cropBlock("rice", ModBlocks.floodedFarmland, ModTags.humidBiomes); + public static final DeferredBlock blockCabbage = cropBlock("cabbage", ModBlocks.farmland, ModTags.coldBiomes); + public static final DeferredBlock blockChickpea = cropBlock("chickpea", ModBlocks.farmland, ModTags.dryBiomes); + public static final DeferredBlock blockDurum = cropBlock("durum", ModBlocks.farmland, null); + public static final DeferredBlock blockEggplant = cropBlock("eggplant", ModBlocks.farmland, null); + public static final DeferredBlock blockGarlic = cropBlock("garlic", ModBlocks.farmland, null); + public static final DeferredBlock blockOnion = cropBlock("onion", ModBlocks.farmland, null); + public static final DeferredBlock blockSoyBean = cropBlock("soybean", ModBlocks.farmland, ModTags.humidBiomes); + public static final DeferredBlock blockTomato = cropBlock("tomato", ModBlocks.farmland, ModTags.temperateBiomes); + public static final DeferredBlock blockRice = cropBlock("rice", ModBlocks.floodedFarmland, ModTags.humidBiomes); /** * Private constructor to hide the implicit public one. @@ -213,31 +213,42 @@ public static List> getCrops() ); } + /** + * Simply registers block, nothing else. + */ private static DeferredBlock simple(final String name, final Supplier block) { return REGISTRY.register(name, block); } + /** + * Registers block with default {@link BlockItem} + */ private static DeferredBlock simpleBlockItem(final String name, final Supplier block) { - final DeferredBlock registered = REGISTRY.register(name, block); + final DeferredBlock registered = simple(name, block); ModItems.REGISTRY.registerSimpleBlockItem(registered); return registered; } /** - * @implNote inlined version of {@link #simpleBlockItem(String, Supplier)} + * Registers block with custom {@link BlockItem} ctor + * + * @implNote inlined version of {@link #simpleBlockItem(String, Supplier)} with custom factory */ private static DeferredBlock customBlockItem(final String name, final Supplier block, final BiFunction blockItemFactory) { - final DeferredBlock registered = REGISTRY.register(name, block); + final DeferredBlock registered = simple(name, block); ModItems.REGISTRY.register(registered.unwrapKey().orElseThrow().location().getPath(), key -> blockItemFactory.apply(registered.get(), new Item.Properties())); return registered; } + /** + * Registers our custom crop block + */ private static DeferredBlock cropBlock(final String name, final DeferredBlock preferredFarmland, @Nullable final TagKey preferredBiome) { return customBlockItem(name, () -> new MinecoloniesCropBlock(preferredFarmland, preferredBiome), (b, prop) -> new ItemCrop(b, prop, preferredBiome)); diff --git a/src/main/java/com/minecolonies/api/colony/buildings/registry/BuildingEntry.java b/src/main/java/com/minecolonies/api/colony/buildings/registry/BuildingEntry.java index 2093425f535..18a2c403ce9 100755 --- a/src/main/java/com/minecolonies/api/colony/buildings/registry/BuildingEntry.java +++ b/src/main/java/com/minecolonies/api/colony/buildings/registry/BuildingEntry.java @@ -10,7 +10,6 @@ import com.minecolonies.api.colony.buildings.views.IBuildingView; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.neoforged.neoforge.registries.DeferredBlock; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -52,7 +51,7 @@ public static final class Builder * @param buildingBlock The block. * @return The builder. */ - public Builder setBuildingBlock(final DeferredBlock> buildingBlock) + public Builder setBuildingBlock(final Supplier> buildingBlock) { this.buildingBlock = buildingBlock.get(); return this; diff --git a/src/main/java/com/minecolonies/api/items/ModItems.java b/src/main/java/com/minecolonies/api/items/ModItems.java index 0cf7b1f3ed6..d9bcdbec4d1 100755 --- a/src/main/java/com/minecolonies/api/items/ModItems.java +++ b/src/main/java/com/minecolonies/api/items/ModItems.java @@ -2,15 +2,12 @@ import com.minecolonies.api.blocks.ModBlocks; import com.minecolonies.api.colony.jobs.ModJobs; -import com.minecolonies.api.entity.ModEntities; import com.minecolonies.api.util.constant.Constants; import com.minecolonies.core.items.*; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.neoforged.neoforge.common.DeferredSpawnEggItem; @@ -29,82 +26,81 @@ public final class ModItems { public static final DeferredRegister.Items REGISTRY = DeferredRegister.createItems(Constants.MOD_ID); - public final static DeferredRegister DEFERRED_REGISTER = DeferredRegister.create(BuiltInRegistries.ARMOR_MATERIAL, Constants.MOD_ID); - - public static final DeferredItem adventureToken = custom("adventure_token", ItemAdventureToken::new); - public static final DeferredItem ancientTome = custom("ancienttome", ItemAncientTome::new); - public static final DeferredItem bannerRallyGuards = custom("banner_rally_guards", ItemBannerRallyGuards::new); - public static final DeferredItem buildGoggles = custom("build_goggles", ItemBuildGoggles::new); - public static final DeferredItem chiefSword = custom("chiefsword", ItemChiefSword::new); - public static final DeferredItem clipboard = custom("clipboard", ItemClipboard::new); - public static final DeferredItem compost = custom("compost", ItemCompost::new); - public static final DeferredItem firearrow = custom("firearrow", ItemFireArrow::new); - public static final DeferredItem flagBanner = custom("colony_banner", prop -> new ItemColonyFlagBanner(ModBlocks.blockColonyBanner.get(), ModBlocks.blockColonyWallBanner.get(), prop.stacksTo(1))); - public static final DeferredItem magicpotion = custom("magicpotion", ItemMagicPotion::new); - public static final DeferredItem mistletoe = custom("mistletoe", ItemMistletoe::new); - public static final DeferredItem permTool = custom("scepterpermission", ItemScepterPermission::new); - public static final DeferredItem pharaoscepter = custom("pharaoscepter", ItemPharaoScepter::new); - public static final DeferredItem questLog = custom("questlog", ItemQuestLog::new); - public static final DeferredItem resourceScroll = custom("resourcescroll", ItemResourceScroll::new); - public static final DeferredItem santaHat = custom("santa_hat", prop -> new ItemSantaHead(ModArmorMaterials.SANTA_HAT, ArmorItem.Type.HELMET, prop)); - public static final DeferredItem scanAnalyzer = custom("scan_analyzer", ItemScanAnalyzer::new); - public static final DeferredItem scepterBeekeeper = custom("scepterbeekeeper", ItemScepterBeekeeper::new); - public static final DeferredItem scepterGuard = custom("scepterguard", ItemScepterGuard::new); - public static final DeferredItem scepterLumberjack = custom("scepterlumberjack", ItemScepterLumberjack::new); - public static final DeferredItem scimitar = custom("iron_scimitar", ItemIronScimitar::new); - public static final DeferredItem spear = custom("spear", ItemSpear::new); - public static final DeferredItem supplyCamp = custom("supplycampdeployer", ItemSupplyCampDeployer::new); - public static final DeferredItem supplyChest = custom("supplychestdeployer", ItemSupplyChestDeployer::new); + + public static final DeferredItem adventureToken = custom("adventure_token", ItemAdventureToken::new); + public static final DeferredItem ancientTome = custom("ancienttome", ItemAncientTome::new); + public static final DeferredItem bannerRallyGuards = custom("banner_rally_guards", ItemBannerRallyGuards::new); + public static final DeferredItem buildGoggles = custom("build_goggles", ItemBuildGoggles::new); + public static final DeferredItem chiefSword = custom("chiefsword", ItemChiefSword::new); + public static final DeferredItem clipboard = custom("clipboard", ItemClipboard::new); + public static final DeferredItem compost = custom("compost", ItemCompost::new); + public static final DeferredItem firearrow = custom("firearrow", ItemFireArrow::new); + public static final DeferredItem flagBanner = custom("colony_banner", prop -> new ItemColonyFlagBanner(ModBlocks.blockColonyBanner.get(), ModBlocks.blockColonyWallBanner.get(), prop.stacksTo(1))); + public static final DeferredItem magicpotion = custom("magicpotion", ItemMagicPotion::new); + public static final DeferredItem mistletoe = custom("mistletoe", ItemMistletoe::new); + public static final DeferredItem permTool = custom("scepterpermission", ItemScepterPermission::new); + public static final DeferredItem pharaoscepter = custom("pharaoscepter", ItemPharaoScepter::new); + public static final DeferredItem questLog = custom("questlog", ItemQuestLog::new); + public static final DeferredItem resourceScroll = custom("resourcescroll", ItemResourceScroll::new); + public static final DeferredItem santaHat = custom("santa_hat", prop -> new ItemSantaHead(ModArmorMaterials.SANTA_HAT, ArmorItem.Type.HELMET, prop)); + public static final DeferredItem scanAnalyzer = custom("scan_analyzer", ItemScanAnalyzer::new); + public static final DeferredItem scepterBeekeeper = custom("scepterbeekeeper", ItemScepterBeekeeper::new); + public static final DeferredItem scepterGuard = custom("scepterguard", ItemScepterGuard::new); + public static final DeferredItem scepterLumberjack = custom("scepterlumberjack", ItemScepterLumberjack::new); + public static final DeferredItem scimitar = custom("iron_scimitar", ItemIronScimitar::new); + public static final DeferredItem spear = custom("spear", ItemSpear::new); + public static final DeferredItem supplyCamp = custom("supplycampdeployer", ItemSupplyCampDeployer::new); + public static final DeferredItem supplyChest = custom("supplychestdeployer", ItemSupplyChestDeployer::new); public static final DeferredItem pirateHelmet_1 = custom("pirate_hat", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.HELMET, prop)); - public static final DeferredItem pirateChest_1 = custom("pirate_top", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.CHESTPLATE, prop)); - public static final DeferredItem pirateLegs_1 = custom("pirate_leggins", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.LEGGINGS, prop)); - public static final DeferredItem pirateBoots_1 = custom("pirate_boots", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.BOOTS, prop)); + public static final DeferredItem pirateChest_1 = custom("pirate_top", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.CHESTPLATE, prop)); + public static final DeferredItem pirateLegs_1 = custom("pirate_leggins", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.LEGGINGS, prop)); + public static final DeferredItem pirateBoots_1 = custom("pirate_boots", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_1, ArmorItem.Type.BOOTS, prop)); public static final DeferredItem pirateHelmet_2 = custom("pirate_cap", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.HELMET, prop)); - public static final DeferredItem pirateChest_2 = custom("pirate_chest", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.CHESTPLATE, prop)); - public static final DeferredItem pirateLegs_2 = custom("pirate_legs", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.LEGGINGS, prop)); - public static final DeferredItem pirateBoots_2 = custom("pirate_shoes", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.BOOTS, prop)); + public static final DeferredItem pirateChest_2 = custom("pirate_chest", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.CHESTPLATE, prop)); + public static final DeferredItem pirateLegs_2 = custom("pirate_legs", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.LEGGINGS, prop)); + public static final DeferredItem pirateBoots_2 = custom("pirate_shoes", prop -> new ItemPirateGear(ModArmorMaterials.PIRATE_ARMOR_2, ArmorItem.Type.BOOTS, prop)); public static final DeferredItem plateArmorHelmet = custom("plate_armor_helmet", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.HELMET, prop)); - public static final DeferredItem plateArmorChest = custom("plate_armor_chest", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.CHESTPLATE, prop)); - public static final DeferredItem plateArmorLegs = custom("plate_armor_legs", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.LEGGINGS, prop)); - public static final DeferredItem plateArmorBoots = custom("plate_armor_boots", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.BOOTS, prop)); + public static final DeferredItem plateArmorChest = custom("plate_armor_chest", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.CHESTPLATE, prop)); + public static final DeferredItem plateArmorLegs = custom("plate_armor_legs", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.LEGGINGS, prop)); + public static final DeferredItem plateArmorBoots = custom("plate_armor_boots", prop -> new ItemPlateArmor(ModArmorMaterials.PLATE_ARMOR, ArmorItem.Type.BOOTS, prop)); - public static final DeferredItem breadDough = custom("bread_dough", ItemBreadDough::new); - public static final DeferredItem cookieDough = custom("cookie_dough", ItemCookieDough::new); - public static final DeferredItem cakeBatter = custom("cake_batter", ItemCakeBatter::new); + public static final DeferredItem breadDough = custom("bread_dough", ItemBreadDough::new); + public static final DeferredItem cookieDough = custom("cookie_dough", ItemCookieDough::new); + public static final DeferredItem cakeBatter = custom("cake_batter", ItemCakeBatter::new); public static final DeferredItem rawPumpkinPie = custom("raw_pumpkin_pie", ItemRawPumpkinPie::new); - public static final DeferredItem milkyBread = custom("milky_bread", ItemMilkyBread::new); + public static final DeferredItem milkyBread = custom("milky_bread", ItemMilkyBread::new); public static final DeferredItem sugaryBread = custom("sugary_bread", ItemSugaryBread::new); public static final DeferredItem goldenBread = custom("golden_bread", ItemGoldenBread::new); public static final DeferredItem chorusBread = custom("chorus_bread", ItemChorusBread::new); - public static final DeferredItem scrollColonyTP = custom("scroll_tp", prop -> new ItemScrollColonyTP(prop.stacksTo(16))); + public static final DeferredItem scrollColonyTP = custom("scroll_tp", prop -> new ItemScrollColonyTP(prop.stacksTo(16))); public static final DeferredItem scrollColonyAreaTP = custom("scroll_area_tp", prop -> new ItemScrollColonyAreaTP(prop.stacksTo(16))); - public static final DeferredItem scrollBuff = custom("scroll_buff", prop -> new ItemScrollBuff(prop.stacksTo(16))); - public static final DeferredItem scrollGuardHelp = custom("scroll_guard_help", prop -> new ItemScrollGuardHelp(prop.stacksTo(16))); - public static final DeferredItem scrollHighLight = custom("scroll_highlight", prop -> new ItemScrollHighlight(prop.stacksTo(16))); + public static final DeferredItem scrollBuff = custom("scroll_buff", prop -> new ItemScrollBuff(prop.stacksTo(16))); + public static final DeferredItem scrollGuardHelp = custom("scroll_guard_help", prop -> new ItemScrollGuardHelp(prop.stacksTo(16))); + public static final DeferredItem scrollHighLight = custom("scroll_highlight", prop -> new ItemScrollHighlight(prop.stacksTo(16))); - public static final DeferredItem sifterMeshString = custom("sifter_mesh_string", prop -> new ItemSifterMesh(prop.durability(500).setNoRepair())); - public static final DeferredItem sifterMeshFlint = custom("sifter_mesh_flint", prop -> new ItemSifterMesh(prop.durability(1000).setNoRepair())); - public static final DeferredItem sifterMeshIron = custom("sifter_mesh_iron", prop -> new ItemSifterMesh(prop.durability(1500).setNoRepair())); + public static final DeferredItem sifterMeshString = custom("sifter_mesh_string", prop -> new ItemSifterMesh(prop.durability(500).setNoRepair())); + public static final DeferredItem sifterMeshFlint = custom("sifter_mesh_flint", prop -> new ItemSifterMesh(prop.durability(1000).setNoRepair())); + public static final DeferredItem sifterMeshIron = custom("sifter_mesh_iron", prop -> new ItemSifterMesh(prop.durability(1500).setNoRepair())); public static final DeferredItem sifterMeshDiamond = custom("sifter_mesh_diamond", prop -> new ItemSifterMesh(prop.durability(2000).setNoRepair())); // Tier 1 Food Items public static final DeferredItem cheddar_cheese = custom("cheddar_cheese", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1)); - public static final DeferredItem feta_cheese = custom("feta_cheese", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1)); - public static final DeferredItem cooked_rice = custom("cooked_rice", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 1)); - public static final DeferredItem tofu = custom("tofu", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1)); - public static final DeferredItem flatbread = custom("flatbread", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.BAKER_ID.getPath(), 1)); + public static final DeferredItem feta_cheese = custom("feta_cheese", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1)); + public static final DeferredItem cooked_rice = custom("cooked_rice", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 1)); + public static final DeferredItem tofu = custom("tofu", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.CHEF_ID.getPath(), 1)); + public static final DeferredItem flatbread = custom("flatbread", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(4).saturationModifier(0.6F).build()), ModJobs.BAKER_ID.getPath(), 1)); // Tier 2 Food Items public static final DeferredItem manchet_bread = custom("manchet_bread", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2)); - public static final DeferredItem lembas_scone = custom("lembas_scone", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2)); - public static final DeferredItem muffin = custom("muffin", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2)); - public static final DeferredItem pottage = custom("pottage", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); - public static final DeferredItem pasta_plain = custom("pasta_plain", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); + public static final DeferredItem lembas_scone = custom("lembas_scone", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2)); + public static final DeferredItem muffin = custom("muffin", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).build()), ModJobs.BAKER_ID.getPath(), 2)); + public static final DeferredItem pottage = custom("pottage", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); + public static final DeferredItem pasta_plain = custom("pasta_plain", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); // Tier 3 Food items public static final DeferredItem hand_pie = custom("hand_pie", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); @@ -126,7 +122,7 @@ public final class ModItems public static final DeferredItem pasta_tomato = custom("pasta_tomato", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); // Tier 3 public static final DeferredItem eggplant_dolma = custom("eggplant_dolma", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); - public static final DeferredItem stuffed_pita = custom("stuffed_pita", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); + public static final DeferredItem stuffed_pita = custom("stuffed_pita", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); // Hot Dry Biomes // Tier 2 @@ -138,57 +134,20 @@ public final class ModItems // Tier 2 public static final DeferredItem congee = custom("congee", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(6).saturationModifier(1.0F).usingConvertsTo(Items.BOWL).build()), ModJobs.CHEF_ID.getPath(), 2)); // Tier 3 - public static final DeferredItem stew_trencher = custom("stew_trencher", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); + public static final DeferredItem stew_trencher = custom("stew_trencher", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); public static final DeferredItem stuffed_pepper = custom("stuffed_pepper", prop -> new ItemFood(prop.food(new FoodProperties.Builder().nutrition(8).saturationModifier(1.2F).build()), ModJobs.CHEF_ID.getPath(), 3)); // Just dough - public static final DeferredItem muffin_dough = simple("muffin_dough"); + public static final DeferredItem muffin_dough = simple("muffin_dough"); public static final DeferredItem manchet_dough = simple("manchet_dough"); - public static final DeferredItem raw_noodle = simple("raw_noodle"); - public static final DeferredItem butter = simple("butter"); + public static final DeferredItem raw_noodle = simple("raw_noodle"); + public static final DeferredItem butter = simple("butter"); - public static final DeferredItem large_empty_bottle = custom("large_empty_bottle", ItemLargeBottle::new); - public static final DeferredItem large_milk_bottle = custom("large_milk_bottle", prop -> new ItemLargeBottle(prop.craftRemainder(large_empty_bottle.get()))); - public static final DeferredItem large_water_bottle = custom("large_water_bottle", prop -> new ItemLargeBottle(prop.craftRemainder(large_empty_bottle.get()))); + public static final DeferredItem large_empty_bottle = custom("large_empty_bottle", ItemLargeBottle::new); + public static final DeferredItem large_milk_bottle = custom("large_milk_bottle", prop -> new ItemLargeBottle(prop.craftRemainder(large_empty_bottle.get()))); + public static final DeferredItem large_water_bottle = custom("large_water_bottle", prop -> new ItemLargeBottle(prop.craftRemainder(large_empty_bottle.get()))); public static final DeferredItem large_soy_milk_bottle = custom("large_soy_milk_bottle", prop -> new ItemLargeBottle(prop.craftRemainder(large_empty_bottle.get()))); - static - { - /** - * Spawn egg colors. - */ - final int PRIMARY_COLOR_BARBARIAN = 5; - final int SECONDARY_COLOR_BARBARIAN = 700; - final int PRIMARY_COLOR_PIRATE = 7; - final int SECONDARY_COLOR_PIRATE = 600; - final int PRIMARY_COLOR_MERC = 8; - final int SECONDARY_COLOR_MERC = 300; - final int PRIMARY_COLOR_EG = 10; - final int SECONDARY_COLOR_EG = 400; - - spawnEgg("barbarianegg", () -> ModEntities.BARBARIAN, PRIMARY_COLOR_BARBARIAN, SECONDARY_COLOR_BARBARIAN); - spawnEgg("barbarcheregg", () -> ModEntities.ARCHERBARBARIAN, PRIMARY_COLOR_BARBARIAN, SECONDARY_COLOR_BARBARIAN); - spawnEgg("barbchiefegg", () -> ModEntities.CHIEFBARBARIAN, PRIMARY_COLOR_BARBARIAN, SECONDARY_COLOR_BARBARIAN); - - spawnEgg("pirateegg", () -> ModEntities.PIRATE, PRIMARY_COLOR_PIRATE, SECONDARY_COLOR_PIRATE); - spawnEgg("piratearcheregg", () -> ModEntities.ARCHERPIRATE, PRIMARY_COLOR_PIRATE, SECONDARY_COLOR_PIRATE); - spawnEgg("piratecaptainegg", () -> ModEntities.CHIEFPIRATE, PRIMARY_COLOR_PIRATE, SECONDARY_COLOR_PIRATE); - - spawnEgg("mummyegg", () -> ModEntities.MUMMY, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("mummyarcheregg", () -> ModEntities.ARCHERMUMMY, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("pharaoegg", () -> ModEntities.PHARAO, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - - spawnEgg("shieldmaidenegg", () -> ModEntities.SHIELDMAIDEN, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("norsemenarcheregg", () -> ModEntities.NORSEMEN_ARCHER, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("norsemenchiefegg", () -> ModEntities.NORSEMEN_CHIEF, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - - spawnEgg("amazonegg", () -> ModEntities.AMAZON, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("amazonspearmanegg", () -> ModEntities.AMAZONSPEARMAN, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - spawnEgg("amazonchiefegg", () -> ModEntities.AMAZONCHIEF, PRIMARY_COLOR_EG, SECONDARY_COLOR_EG); - - spawnEgg("mercegg", () -> ModEntities.MERCENARY, PRIMARY_COLOR_MERC, SECONDARY_COLOR_MERC); - } - /** * Private constructor to hide the implicit public one. */ @@ -199,16 +158,25 @@ private ModItems() */ } + /** + * Simply registers custom item, nothing else. + */ private static DeferredItem custom(final String name, final Function item) { return REGISTRY.register(name, () -> item.apply(new Item.Properties())); } + /** + * Simply registers item, nothing else. + */ private static DeferredItem simple(final String name) { return custom(name, Item::new); } + /** + * Registers spawn egg for given entity. + */ private static DeferredItem spawnEgg(final String name, final Supplier> entityType, final int backgroundColor, diff --git a/src/main/java/com/minecolonies/apiimp/initializer/TileEntityInitializer.java b/src/main/java/com/minecolonies/apiimp/initializer/TileEntityInitializer.java index 82d059a8d85..b8d036ade99 100755 --- a/src/main/java/com/minecolonies/apiimp/initializer/TileEntityInitializer.java +++ b/src/main/java/com/minecolonies/apiimp/initializer/TileEntityInitializer.java @@ -21,31 +21,19 @@ public class TileEntityInitializer static { - MinecoloniesTileEntities.SCARECROW = simple("scarecrow", TileEntityScarecrow::new, ModBlocks.blockScarecrow); - + MinecoloniesTileEntities.SCARECROW = simple("scarecrow", TileEntityScarecrow::new, ModBlocks.blockScarecrow); MinecoloniesTileEntities.PLANTATION_FIELD = simple("plantationfield", TileEntityPlantationField::new, ModBlocks.blockPlantationField); - - MinecoloniesTileEntities.BARREL = simple("barrel", TileEntityBarrel::new, ModBlocks.blockBarrel); - - MinecoloniesTileEntities.BUILDING = list("colonybuilding", TileEntityColonyBuilding::new, ModBlocks.getHuts()); - - MinecoloniesTileEntities.DECO_CONTROLLER = simple("decorationcontroller", TileEntityDecorationController::new, ModBlocks.blockDecorationPlaceholder); - - MinecoloniesTileEntities.RACK = simple("rack", TileEntityRack::new, ModBlocks.blockRack); - - MinecoloniesTileEntities.GRAVE = simple("grave", TileEntityGrave::new, ModBlocks.blockGrave); - - MinecoloniesTileEntities.NAMED_GRAVE = simple("namedgrave", TileEntityNamedGrave::new, ModBlocks.blockNamedGrave); - - MinecoloniesTileEntities.WAREHOUSE = simple("warehouse", TileEntityWareHouse::new, ModBlocks.blockHutWareHouse); - - MinecoloniesTileEntities.COMPOSTED_DIRT = simple("composteddirt", TileEntityCompostedDirt::new, ModBlocks.blockCompostedDirt); - - MinecoloniesTileEntities.ENCHANTER = simple("enchanter", TileEntityEnchanter::new, ModBlocks.blockHutEnchanter); - - MinecoloniesTileEntities.STASH = simple("stash", TileEntityStash::new, ModBlocks.blockStash); - - MinecoloniesTileEntities.COLONY_FLAG = list("colony_flag", TileEntityColonyFlag::new, List.of(ModBlocks.blockColonyBanner, ModBlocks.blockColonyWallBanner)); + MinecoloniesTileEntities.BARREL = simple("barrel", TileEntityBarrel::new, ModBlocks.blockBarrel); + MinecoloniesTileEntities.BUILDING = list("colonybuilding", TileEntityColonyBuilding::new, ModBlocks.getHuts()); + MinecoloniesTileEntities.DECO_CONTROLLER = simple("decorationcontroller", TileEntityDecorationController::new, ModBlocks.blockDecorationPlaceholder); + MinecoloniesTileEntities.RACK = simple("rack", TileEntityRack::new, ModBlocks.blockRack); + MinecoloniesTileEntities.GRAVE = simple("grave", TileEntityGrave::new, ModBlocks.blockGrave); + MinecoloniesTileEntities.NAMED_GRAVE = simple("namedgrave", TileEntityNamedGrave::new, ModBlocks.blockNamedGrave); + MinecoloniesTileEntities.WAREHOUSE = simple("warehouse", TileEntityWareHouse::new, ModBlocks.blockHutWareHouse); + MinecoloniesTileEntities.COMPOSTED_DIRT = simple("composteddirt", TileEntityCompostedDirt::new, ModBlocks.blockCompostedDirt); + MinecoloniesTileEntities.ENCHANTER = simple("enchanter", TileEntityEnchanter::new, ModBlocks.blockHutEnchanter); + MinecoloniesTileEntities.STASH = simple("stash", TileEntityStash::new, ModBlocks.blockStash); + MinecoloniesTileEntities.COLONY_FLAG = list("colony_flag", TileEntityColonyFlag::new, List.of(ModBlocks.blockColonyBanner, ModBlocks.blockColonyWallBanner)); } private static DeferredHolder, BlockEntityType> simple(final String id,