diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index a08bd72e3..99a7dbc44 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -21,383 +21,152 @@ import java.util.Objects; public class ActuallyBlocks { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, ActuallyAdditions.MOD_ID); - public static final RegistryObject blockCrystalClusterRedstone - = BLOCKS.register("crystal_cluster_redstone_block", () -> new CrystalClusterBlock(Crystals.REDSTONE)); - - public static final RegistryObject blockCrystalClusterLapis - = BLOCKS.register("crystal_cluster_lapis_block", () -> new CrystalClusterBlock(Crystals.LAPIS)); - - public static final RegistryObject blockCrystalClusterDiamond - = BLOCKS.register("crystal_cluster_diamond_block", () -> new CrystalClusterBlock(Crystals.DIAMOND)); - - public static final RegistryObject blockCrystalClusterCoal - = BLOCKS.register("crystal_cluster_coal_block", () -> new CrystalClusterBlock(Crystals.COAL)); - - public static final RegistryObject blockCrystalClusterEmerald - = BLOCKS.register("crystal_cluster_emerald_block", () -> new CrystalClusterBlock(Crystals.EMERALD)); - - public static final RegistryObject blockCrystalClusterIron - = BLOCKS.register("crystal_cluster_iron_block", () -> new CrystalClusterBlock(Crystals.IRON)); - - public static final RegistryObject blockBatteryBox - = BLOCKS.register("battery_box_block", BatteryBoxBlock::new); - - public static final RegistryObject blockItemViewerHopping - = BLOCKS.register("item_viewer_hopping_block", ItemViewerHoppingBlock::new); - - public static final RegistryObject blockFarmer - = BLOCKS.register("farmer_block", FarmerBlock::new); - - public static final RegistryObject blockBioReactor - = BLOCKS.register("bio_reactor_block", BioReactorBlock::new); - - public static final RegistryObject blockEmpowerer - = BLOCKS.register("empowerer_block", EmpowererBlock::new); - - public static final RegistryObject blockTinyTorch - = BLOCKS.register("tiny_torch_block", TinyTorchBlock::new); - - public static final RegistryObject blockShockSuppressor - = BLOCKS.register("shock_suppressor_block", ShockSuppressorBlock::new); - - public static final RegistryObject blockDisplayStand - = BLOCKS.register("display_stand_block", DisplayStandBlock::new); - - public static final RegistryObject blockPlayerInterface - = BLOCKS.register("player_interface_block", PlayerInterfaceBlock::new); - - public static final RegistryObject blockItemViewer - = BLOCKS.register("item_viewer_block", ItemViewerBlock::new); - - public static final RegistryObject blockFireworkBox - = BLOCKS.register("firework_box_block", FireworkBoxBlock::new); - - public static final RegistryObject blockMiner - = BLOCKS.register("miner_block", MinerBlock::new); - - public static final RegistryObject blockAtomicReconstructor - = BLOCKS.register("atomic_reconstructor_block", AtomicReconstructorBlock::new); - - public static final RegistryObject blockCrystalQuarts - = BLOCKS.register("crystal_quarts_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalRedstone - = BLOCKS.register("crystal_redstone_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalLapis - = BLOCKS.register("crystal_lapis_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalDiamond - = BLOCKS.register("crystal_diamond_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalVoid - = BLOCKS.register("crystal_void_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalEmerald - = BLOCKS.register("crystal_emerald_block", () -> new CrystalBlock(false)); - - public static final RegistryObject blockCrystalEmpoweredQuarts - = BLOCKS.register("crystal_quarts_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockCrystalEmpoweredRedstone - = BLOCKS.register("crystal_redstone_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockCrystalEmpoweredLapis - = BLOCKS.register("crystal_lapis_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockCrystalEmpoweredDiamond - = BLOCKS.register("crystal_diamond_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockCrystalEmpoweredVoid - = BLOCKS.register("crystal_void_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockCrystalEmpoweredEmerald - = BLOCKS.register("crystal_emerald_empowered_block", () -> new CrystalBlock(true)); - - public static final RegistryObject blockBlackLotus - = BLOCKS.register("black_lotus_block", BlackLotusBlock::new); - - public static final RegistryObject blockLaserRelay - = BLOCKS.register("laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_BASIC)); - - public static final RegistryObject blockLaserRelayAdvanced - = BLOCKS.register("laser_relay_advanced_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_ADVANCED)); - - public static final RegistryObject blockLaserRelayExtreme - = BLOCKS.register("laser_relay_extreme_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_EXTREME)); - - public static final RegistryObject blockLaserRelayFluids - = BLOCKS.register("laser_relay_fluids_block", () -> new LaserRelayBlock(LaserRelays.FLUIDS)); - - public static final RegistryObject blockLaserRelayItem - = BLOCKS.register("laser_relay_item_block", () -> new LaserRelayBlock(LaserRelays.ITEM)); - - public static final RegistryObject blockLaserRelayItemWhitelist - = BLOCKS.register("laser_relay_item_whitelist_block", () -> new LaserRelayBlock(LaserRelays.ITEM_WHITELIST)); - - public static final RegistryObject blockRangedCollector - = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); - - public static final RegistryObject blockDirectionalBreaker - = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); - - public static final RegistryObject blockLeafGenerator - = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); - - public static final RegistryObject blockSmileyCloud - = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); - - public static final RegistryObject blockXPSolidifier - = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); - - public static final RegistryObject blockTestifiBucksGreenWall - = BLOCKS.register("green_wall_block", GenericBlock::new); - - public static final RegistryObject blockTestifiBucksWhiteWall - = BLOCKS.register("white_wall_block", GenericBlock::new); - - public static final RegistryObject blockTestifiBucksGreenStairs - = BLOCKS.register("green_stairs_block", () -> new StairsBlock(() -> blockTestifiBucksGreenWall.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockTestifiBucksWhiteStairs - = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> blockTestifiBucksWhiteWall.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockTestifiBucksGreenSlab - = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockTestifiBucksWhiteSlab - = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockTestifiBucksGreenFence - = BLOCKS.register("green_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockTestifiBucksWhiteFence - = BLOCKS.register("white_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject LAMP_WHITE - = BLOCKS.register("lamp_white_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_ORANGE - = BLOCKS.register("lamp_orange_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_MAGENTA - = BLOCKS.register("lamp_magenta_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_LIGHT_BLUE - = BLOCKS.register("lamp_light_blue_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_YELLOW - = BLOCKS.register("lamp_yellow_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_LIME - = BLOCKS.register("lamp_lime_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_PINK - = BLOCKS.register("lamp_pink_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_GRAY - = BLOCKS.register("lamp_gray_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_LIGHT_GRAY - = BLOCKS.register("lamp_light_gray_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_CYAN - = BLOCKS.register("lamp_cyan_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_PURPLE - = BLOCKS.register("lamp_purple_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_BLUE - = BLOCKS.register("lamp_blue_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_BROWN - = BLOCKS.register("lamp_brown_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_GREEN - = BLOCKS.register("lamp_green_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_RED - = BLOCKS.register("lamp_red_block", ColoredLampBlock::new); - - public static final RegistryObject LAMP_BLACK - = BLOCKS.register("lamp_black_block", ColoredLampBlock::new); - - public static final RegistryObject blockLampPowerer - = BLOCKS.register("lamp_powerer_block", LampPowererBlock::new); - - public static final RegistryObject blockTreasureChest - = BLOCKS.register("treasure_chest_block", TreasureChestBlock::new); - - public static final RegistryObject blockEnergizer - = BLOCKS.register("energizer_block", () -> new EnergizerBlock(true)); - - public static final RegistryObject blockEnervator - = BLOCKS.register("enervator_block", () -> new EnergizerBlock(false)); - - public static final RegistryObject blockLavaFactoryController - = BLOCKS.register("lava_factory_controller_block", LavaFactoryControllerBlock::new); - - public static final RegistryObject blockCanolaPress - = BLOCKS.register("canola_press_block", CanolaPressBlock::new); - - public static final RegistryObject blockPhantomface - = BLOCKS.register("phantomface_block", () -> new PhantomBlock(PhantomType.FACE)); - - public static final RegistryObject blockPhantomPlacer - = BLOCKS.register("phantom_placer_block", () -> new PhantomBlock(PhantomType.PLACER)); - - public static final RegistryObject blockPhantomLiquiface - = BLOCKS.register("phantom_liquiface_block", () -> new PhantomBlock(PhantomType.LIQUIFACE)); - - public static final RegistryObject blockPhantomEnergyface - = BLOCKS.register("phantom_energyface_block", () -> new PhantomBlock(PhantomType.ENERGYFACE)); - - public static final RegistryObject blockPhantomRedstoneface - = BLOCKS.register("phantom_redstoneface_block", () -> new PhantomBlock(PhantomType.REDSTONEFACE)); - - public static final RegistryObject blockPhantomBreaker - = BLOCKS.register("phantom_breaker_block", () -> new PhantomBlock(PhantomType.BREAKER)); - - public static final RegistryObject blockCoalGenerator - = BLOCKS.register("coal_generator_block", CoalGeneratorBlock::new); - - public static final RegistryObject blockOilGenerator - = BLOCKS.register("oil_generator_block", OilGeneratorBlock::new); - - public static final RegistryObject blockFermentingBarrel - = BLOCKS.register("fermenting_barrel_block", FermentingBarrelBlock::new); - - public static final RegistryObject blockRice - = BLOCKS.register("rice_block", () -> new PlantBlock(1, 2)); - - public static final RegistryObject blockCanola - = BLOCKS.register("canola_block", () -> new PlantBlock(2, 3)); - - public static final RegistryObject blockFlax - = BLOCKS.register("flax_block", () -> new PlantBlock(2, 4)); - - public static final RegistryObject blockCoffee - = BLOCKS.register("coffee_block", () -> new PlantBlock(2, 2)); - - public static final RegistryObject BLACK_QUARTS - = BLOCKS.register("black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject BLACK_QUARTS_CHISELED - = BLOCKS.register("black_quartz_chiseled_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject BLACK_QUARTS_PILLAR - = BLOCKS.register("black_quartz_pillar_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject CHARCOAL - = BLOCKS.register("charcoal_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject ENDER_CASING - = BLOCKS.register("ender_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject ENDERPEARL - = BLOCKS.register("enderpearl_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject IRON_CASING - = BLOCKS.register("iron_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject IRON_CASING_SNOW - = BLOCKS.register("iron_casing_snow_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject LAVA_FACTORY_CASE - = BLOCKS.register("lava_factory_case_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject ORE_BLACK_QUARTS - = BLOCKS.register("ore_black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject WOOD_CASING - = BLOCKS.register("wood_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); - -// public static final RegistryObject blockMisc -// = BLOCKS.register();("misc_block", () -> new Block(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockFeeder - = BLOCKS.register("feeder_block", FeederBlock::new); - - public static final RegistryObject blockGrinder - = BLOCKS.register("grinder_block", () -> new GrinderBlock(false)); - - public static final RegistryObject blockGrinderDouble - = BLOCKS.register("grinder_double_block", () -> new GrinderBlock(true)); - - public static final RegistryObject blockFurnaceDouble - = BLOCKS.register("furnace_double_block", FurnaceDoubleBlock::new); - - public static final RegistryObject blockInputter - = BLOCKS.register("inputter_block", () -> new InputterBlock(false)); - - public static final RegistryObject blockInputterAdvanced - = BLOCKS.register("inputter_advanced_block", () -> new InputterBlock(true)); - - public static final RegistryObject blockFishingNet - = BLOCKS.register("fishing_net_block", FishingNetBlock::new); - - public static final RegistryObject blockFurnaceSolar - = BLOCKS.register("furnace_solar_block", FurnaceSolarBlock::new); - - public static final RegistryObject blockHeatCollector - = BLOCKS.register("heat_collector_block", HeatCollectorBlock::new); - - public static final RegistryObject blockItemRepairer - = BLOCKS.register("item_repairer_block", ItemRepairerBlock::new); - - public static final RegistryObject blockGreenhouseGlass - = BLOCKS.register("greenhouse_glass_block", GreenhouseGlassBlock::new); - - public static final RegistryObject blockBreaker - = BLOCKS.register("breaker_block", () -> new BreakerBlock(false)); - - public static final RegistryObject blockPlacer - = BLOCKS.register("placer_block", () -> new BreakerBlock(true)); - - public static final RegistryObject blockDropper - = BLOCKS.register("dropper_block", () -> new DropperBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockFluidPlacer - = BLOCKS.register("fluid_placer_block", () -> new FluidCollectorBlock(true)); - - public static final RegistryObject blockFluidCollector - = BLOCKS.register("fluid_collector_block", () -> new FluidCollectorBlock(false)); - - public static final RegistryObject blockCoffeeMachine - = BLOCKS.register("coffee_machine_block", CoffeeMachineBlock::new); - - public static final RegistryObject blockPhantomBooster - = BLOCKS.register("phantom_booster_block", PhantomBoosterBlock::new); - -// public static final RegistryObject blockWildPlant -// = BLOCKS.register();("wild_block", WildPlantBlock::new); - - public static final RegistryObject blockQuartzWall - = BLOCKS.register("quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTS.get()))); - - public static final RegistryObject blockChiseledQuartzWall - = BLOCKS.register("chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTS_CHISELED.get()))); - - public static final RegistryObject blockPillarQuartzWall - = BLOCKS.register("pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTS_PILLAR.get()))); - - public static final RegistryObject blockQuartzStair - = BLOCKS.register("quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockChiseledQuartzStair - = BLOCKS.register("chiseled_quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockPillarQuartzStair - = BLOCKS.register("pillar_quartz_stair_block", () -> new StairsBlock(() -> blockBlackLotus.get().getDefaultState(), Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockQuartzSlab - = BLOCKS.register("quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockChiseledQuartzSlab - = BLOCKS.register("chiseled_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); - - public static final RegistryObject blockPillarQuartzSlab - = BLOCKS.register("pillar_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + // Plant! + public static final RegistryObject BLACK_LOTUS = BLOCKS.register("black_lotus_block", BlackLotusBlock::new); + public static final RegistryObject RICE = BLOCKS.register("rice_block", () -> new PlantBlock(1, 2)); + public static final RegistryObject CANOLA = BLOCKS.register("canola_block", () -> new PlantBlock(2, 3)); + public static final RegistryObject FLAX = BLOCKS.register("flax_block", () -> new PlantBlock(2, 4)); + public static final RegistryObject COFFEE = BLOCKS.register("coffee_block", () -> new PlantBlock(2, 2)); + + // TILE BLOCKS + public static final RegistryObject BATTERY_BOX = BLOCKS.register("battery_box_block", BatteryBoxBlock::new); + public static final RegistryObject HOPPING_ITEM_INTERFACE = BLOCKS.register("hopping_item_interface_block", ItemViewerHoppingBlock::new); + public static final RegistryObject FARMER = BLOCKS.register("farmer_block", FarmerBlock::new); + public static final RegistryObject BIO_REACTOR = BLOCKS.register("bio_reactor_block", BioReactorBlock::new); + public static final RegistryObject EMPOWERER = BLOCKS.register("empowerer_block", EmpowererBlock::new); + public static final RegistryObject TINY_TORCH = BLOCKS.register("tiny_torch_block", TinyTorchBlock::new); + public static final RegistryObject SHOCK_SUPPRESSOR = BLOCKS.register("shock_suppressor_block", ShockSuppressorBlock::new); + public static final RegistryObject DISPLAY_STAND = BLOCKS.register("display_stand_block", DisplayStandBlock::new); + public static final RegistryObject PLAYER_INTERFACE = BLOCKS.register("player_interface_block", PlayerInterfaceBlock::new); + public static final RegistryObject ITEM_INTERFACE = BLOCKS.register("item_interface_block", ItemViewerBlock::new); + public static final RegistryObject FIREWORK_BOX = BLOCKS.register("firework_box_block", FireworkBoxBlock::new); + public static final RegistryObject MINER = BLOCKS.register("miner_block", MinerBlock::new); + public static final RegistryObject ATOMIC_RECONSTRUCTOR = BLOCKS.register("atomic_reconstructor_block", AtomicReconstructorBlock::new); + public static final RegistryObject TREASURE_CHEST = BLOCKS.register("treasure_chest_block", TreasureChestBlock::new); + public static final RegistryObject ENERGIZER = BLOCKS.register("energizer_block", () -> new EnergizerBlock(true)); + public static final RegistryObject ENERVATOR = BLOCKS.register("enervator_block", () -> new EnergizerBlock(false)); + public static final RegistryObject LAVA_FACTORY_CONTROLLER = BLOCKS.register("lava_factory_controller_block", LavaFactoryControllerBlock::new); + public static final RegistryObject CANOLA_PRESS = BLOCKS.register("canola_press_block", CanolaPressBlock::new); + public static final RegistryObject PHANTOMFACE = BLOCKS.register("phantomface_block", () -> new PhantomBlock(PhantomType.FACE)); + public static final RegistryObject PHANTOM_PLACER = BLOCKS.register("phantom_placer_block", () -> new PhantomBlock(PhantomType.PLACER)); + public static final RegistryObject PHANTOM_LIQUIFACE = BLOCKS.register("phantom_liquiface_block", () -> new PhantomBlock(PhantomType.LIQUIFACE)); + public static final RegistryObject PHANTOM_ENERGYFACE = BLOCKS.register("phantom_energyface_block", () -> new PhantomBlock(PhantomType.ENERGYFACE)); + public static final RegistryObject PHANTOM_REDSTONEFACE = BLOCKS.register("phantom_redstoneface_block", () -> new PhantomBlock(PhantomType.REDSTONEFACE)); + public static final RegistryObject PHANTOM_BREAKER = BLOCKS.register("phantom_breaker_block", () -> new PhantomBlock(PhantomType.BREAKER)); + public static final RegistryObject COAL_GENERATOR = BLOCKS.register("coal_generator_block", CoalGeneratorBlock::new); + public static final RegistryObject OIL_GENERATOR = BLOCKS.register("oil_generator_block", OilGeneratorBlock::new); + public static final RegistryObject FERMENTING_BARREL = BLOCKS.register("fermenting_barrel_block", FermentingBarrelBlock::new); + public static final RegistryObject FEEDER = BLOCKS.register("feeder_block", FeederBlock::new); + public static final RegistryObject CRUSHER = BLOCKS.register("crusher_block", () -> new GrinderBlock(false)); + public static final RegistryObject CRUSHER_DOUBLE = BLOCKS.register("crusher_double_block", () -> new GrinderBlock(true)); + public static final RegistryObject POWERED_FURNACE = BLOCKS.register("powered_furnace_block", FurnaceDoubleBlock::new); + public static final RegistryObject ESD = BLOCKS.register("esd_block", () -> new InputterBlock(false)); + public static final RegistryObject ESD_ADVANCED = BLOCKS.register("esd_advanced_block", () -> new InputterBlock(true)); + public static final RegistryObject FISHING_NET = BLOCKS.register("fishing_net_block", FishingNetBlock::new); + public static final RegistryObject SOLAR_PANEL = BLOCKS.register("solar_panel_block", FurnaceSolarBlock::new); + public static final RegistryObject HEAT_COLLECTOR = BLOCKS.register("heat_collector_block", HeatCollectorBlock::new); + public static final RegistryObject ITEM_REPAIRER = BLOCKS.register("item_repairer_block", ItemRepairerBlock::new); + public static final RegistryObject GREENHOUSE_GLASS = BLOCKS.register("greenhouse_glass_block", GreenhouseGlassBlock::new); + public static final RegistryObject BREAKER = BLOCKS.register("breaker_block", () -> new BreakerBlock(false)); + public static final RegistryObject PLACER = BLOCKS.register("placer_block", () -> new BreakerBlock(true)); + public static final RegistryObject DROPPER = BLOCKS.register("dropper_block", () -> new DropperBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject FLUID_PLACER = BLOCKS.register("fluid_placer_block", () -> new FluidCollectorBlock(true)); + public static final RegistryObject FLUID_COLLECTOR = BLOCKS.register("fluid_collector_block", () -> new FluidCollectorBlock(false)); + public static final RegistryObject COFFEE_MACHINE = BLOCKS.register("coffee_machine_block", CoffeeMachineBlock::new); + public static final RegistryObject PHANTOM_BOOSTER = BLOCKS.register("phantom_booster_block", PhantomBoosterBlock::new); + + // CRYSTALS + public static final RegistryObject CRYSTAL_QUARTS = BLOCKS.register("crystal_quarts_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_RESTONIA = BLOCKS.register("crystal_restonia_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_PALIS = BLOCKS.register("crystal_palis_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_DIAMATINE = BLOCKS.register("crystal_diamatine_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_VOID = BLOCKS.register("crystal_void_block", () -> new CrystalBlock(false)); + public static final RegistryObject CRYSTAL_EMERADIC = BLOCKS.register("crystal_emeradic_block", () -> new CrystalBlock(false)); + + public static final RegistryObject CRYSTAL_EMPOWERED_QUARTS = BLOCKS.register("crystal_empowered_quarts_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_RESTONIA = BLOCKS.register("crystal_empowered_restonia_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_PALIS = BLOCKS.register("crystal_empowered_palis_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_DIAMATINE = BLOCKS.register("crystal_empowered_diamatine_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_VOID = BLOCKS.register("crystal_empowered_void_block", () -> new CrystalBlock(true)); + public static final RegistryObject CRYSTAL_EMPOWERED_EMERADIC = BLOCKS.register("crystal_empowered_emeradic_block", () -> new CrystalBlock(true)); + + public static final RegistryObject CRYSTAL_CLUSTER_RESTONIA = BLOCKS.register("crystal_cluster_restonia_block", () -> new CrystalClusterBlock(Crystals.REDSTONE)); + public static final RegistryObject CRYSTAL_CLUSTER_PALIS = BLOCKS.register("crystal_cluster_palis_block", () -> new CrystalClusterBlock(Crystals.LAPIS)); + public static final RegistryObject CRYSTAL_CLUSTER_DIAMATINE = BLOCKS.register("crystal_cluster_diamatine_block", () -> new CrystalClusterBlock(Crystals.DIAMOND)); + public static final RegistryObject CRYSTAL_CLUSTER_VOID = BLOCKS.register("crystal_cluster_void_block", () -> new CrystalClusterBlock(Crystals.COAL)); + public static final RegistryObject CRYSTAL_CLUSTER_EMERADIC = BLOCKS.register("crystal_cluster_emeradic_block", () -> new CrystalClusterBlock(Crystals.EMERALD)); + public static final RegistryObject CRYSTAL_CLUSTER_ENORI = BLOCKS.register("crystal_cluster_enori_block", () -> new CrystalClusterBlock(Crystals.IRON)); + + // LASERS + public static final RegistryObject ENERGY_LASER_RELAY = BLOCKS.register("energy_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_BASIC)); + public static final RegistryObject ENERGY_LASER_RELAY_ADVANCED = BLOCKS.register("energy_laser_relay_advanced_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_ADVANCED)); + public static final RegistryObject ENERGY_LASER_RELAY_EXTREME = BLOCKS.register("energy_laser_relay_extreme_block", () -> new LaserRelayBlock(LaserRelays.ENERGY_EXTREME)); + public static final RegistryObject FLUIDS_LASER_RELAY = BLOCKS.register("fluids_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.FLUIDS)); + public static final RegistryObject ITEM_LASER_RELAY = BLOCKS.register("item_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ITEM)); + public static final RegistryObject ADVANCED_ITEM_LASER_RELAY = BLOCKS.register("advanced_item_laser_relay_block", () -> new LaserRelayBlock(LaserRelays.ITEM_WHITELIST)); + public static final RegistryObject RANGED_COLLECTOR = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); + public static final RegistryObject DIRECTIONAL_BREAKER = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); + public static final RegistryObject LEAF_GENERATOR = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); + public static final RegistryObject SMILEY_CLOUD = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); + public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); + + // BUILDING BLOCKS + public static final RegistryObject GREEN_WALL = BLOCKS.register("green_wall_block", GenericBlock::new); + public static final RegistryObject WHITE_WALL = BLOCKS.register("white_wall_block", GenericBlock::new); + public static final RegistryObject GREEN_STAIRS = BLOCKS.register("green_stairs_block", () -> new StairsBlock(() -> GREEN_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject WHITE_STAIRS = BLOCKS.register("white_stairs_block", () -> new StairsBlock(() -> WHITE_WALL.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_SLAB = BLOCKS.register("green_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject WHITE_SLAB = BLOCKS.register("white_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject GREEN_FENCE = BLOCKS.register("green_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject WHITE_FENCE = BLOCKS.register("white_fence_block", () -> new FenceBlock(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject BLACK_QUARTZ = BLOCKS.register("black_quartz_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_CHISELED = BLOCKS.register("black_quartz_chiseled_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_PILLAR = BLOCKS.register("black_quartz_pillar_block", () -> new Block(Block.Properties.create(Material.ROCK))); + + public static final RegistryObject BLACK_QUARTZ_WALL = BLOCKS.register("black_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ.get()))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_WALL = BLOCKS.register("black_chiseled_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_CHISELED.get()))); + public static final RegistryObject BLACK_PILLAR_QUARTZ_WALL = BLOCKS.register("black_pillar_quartz_wall_block", () -> new WallBlock(AbstractBlock.Properties.from(BLACK_QUARTZ_PILLAR.get()))); + public static final RegistryObject BLACK_QUARTZ_STAIR = BLOCKS.register("black_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_STAIR = BLOCKS.register("black_chiseled_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_PILLAR_QUARTZ_STAIR = BLOCKS.register("black_pillar_quartz_stair_block", () -> new StairsBlock(() -> BLACK_QUARTZ.get().getDefaultState(), Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_QUARTZ_SLAB = BLOCKS.register("black_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_CHISELED_QUARTZ_SLAB = BLOCKS.register("black_chiseled_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + public static final RegistryObject BLACK_PILLAR_QUARTZ_SLAB = BLOCKS.register("black_pillar_quartz_slab_block", () -> new SlabBlock(Block.Properties.create(Material.ROCK))); + + // LAMPS! SO MANY LAMPS + public static final RegistryObject LAMP_WHITE = BLOCKS.register("lamp_white_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_ORANGE = BLOCKS.register("lamp_orange_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_MAGENTA = BLOCKS.register("lamp_magenta_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_LIGHT_BLUE = BLOCKS.register("lamp_light_blue_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_YELLOW = BLOCKS.register("lamp_yellow_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_LIME = BLOCKS.register("lamp_lime_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_PINK = BLOCKS.register("lamp_pink_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_GRAY = BLOCKS.register("lamp_gray_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_LIGHT_GRAY = BLOCKS.register("lamp_light_gray_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_CYAN = BLOCKS.register("lamp_cyan_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_PURPLE = BLOCKS.register("lamp_purple_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_BLUE = BLOCKS.register("lamp_blue_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_BROWN = BLOCKS.register("lamp_brown_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_GREEN = BLOCKS.register("lamp_green_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_RED = BLOCKS.register("lamp_red_block", ColoredLampBlock::new); + public static final RegistryObject LAMP_BLACK = BLOCKS.register("lamp_black_block", ColoredLampBlock::new); + + public static final RegistryObject LAMP_CONTROLLER = BLOCKS.register("lamp_controller_block", LampPowererBlock::new); + + // MISC BLOCKS + public static final RegistryObject ENDERPEARL = BLOCKS.register("enderpearl_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject CHARCOAL = BLOCKS.register("charcoal_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject ORE_BLACK_QUARTS = BLOCKS.register("ore_black_quarts_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject IRON_CASING = BLOCKS.register("iron_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject LAVA_FACTORY_CASE = BLOCKS.register("lava_factory_case_block", () -> new Block(Block.Properties.create(Material.ROCK))); + public static final RegistryObject WOOD_CASING = BLOCKS.register("wood_casing_block", () -> new Block(Block.Properties.create(Material.ROCK))); + +// I don't know what this is :cry: +// public static final RegistryObject WildPlant +// = BLOCKS.register("wild_block", WildPlantBlock::new); @SubscribeEvent public static void registerBlockItems(RegistryEvent.Register event) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java index a82789b54..87080bab2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/TinyTorchBlock.java @@ -1,9 +1,24 @@ package de.ellpeck.actuallyadditions.common.blocks; import net.minecraft.block.material.Material; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.world.IBlockReader; + +import javax.annotation.Nullable; +import java.util.List; public class TinyTorchBlock extends ActuallyBlock { public TinyTorchBlock() { super(Properties.create(Material.ROCK)); } + + @Override + public void addInformation(ItemStack stack, @Nullable IBlockReader worldIn, List tooltip, ITooltipFlag flagIn) { + super.addInformation(stack, worldIn, tooltip, flagIn); + + tooltip.add(new TranslationTextComponent("misc.message.so_cute")); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java index c286ceae9..523706054 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -19,57 +19,57 @@ public class GeneratorBlockStates extends BlockStateProvider { @Override protected void registerStatesAndModels() { - buildCubeAll(ActuallyBlocks.blockCrystalClusterRedstone); - buildCubeAll(ActuallyBlocks.blockCrystalClusterLapis); - buildCubeAll(ActuallyBlocks.blockCrystalClusterDiamond); - buildCubeAll(ActuallyBlocks.blockCrystalClusterCoal); - buildCubeAll(ActuallyBlocks.blockCrystalClusterEmerald); - buildCubeAll(ActuallyBlocks.blockCrystalClusterIron); - buildCubeAll(ActuallyBlocks.blockBatteryBox); - buildCubeAll(ActuallyBlocks.blockItemViewerHopping); - buildCubeAll(ActuallyBlocks.blockFarmer); - buildCubeAll(ActuallyBlocks.blockBioReactor); - buildCubeAll(ActuallyBlocks.blockEmpowerer); - buildCubeAll(ActuallyBlocks.blockTinyTorch); - buildCubeAll(ActuallyBlocks.blockShockSuppressor); - buildCubeAll(ActuallyBlocks.blockDisplayStand); - buildCubeAll(ActuallyBlocks.blockPlayerInterface); - buildCubeAll(ActuallyBlocks.blockItemViewer); - buildCubeAll(ActuallyBlocks.blockFireworkBox); - buildCubeAll(ActuallyBlocks.blockMiner); - buildCubeAll(ActuallyBlocks.blockAtomicReconstructor); - buildCubeAll(ActuallyBlocks.blockCrystalRedstone); - buildCubeAll(ActuallyBlocks.blockCrystalLapis); - buildCubeAll(ActuallyBlocks.blockCrystalDiamond); - buildCubeAll(ActuallyBlocks.blockCrystalVoid); - buildCubeAll(ActuallyBlocks.blockCrystalEmerald); - buildCubeAll(ActuallyBlocks.blockCrystalQuarts); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredRedstone); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredLapis); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredDiamond); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredVoid); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredEmerald); - buildCubeAll(ActuallyBlocks.blockCrystalEmpoweredQuarts); - buildCubeAll(ActuallyBlocks.blockBlackLotus); - buildCubeAll(ActuallyBlocks.blockLaserRelay); - buildCubeAll(ActuallyBlocks.blockLaserRelayAdvanced); - buildCubeAll(ActuallyBlocks.blockLaserRelayExtreme); - buildCubeAll(ActuallyBlocks.blockLaserRelayFluids); - buildCubeAll(ActuallyBlocks.blockLaserRelayItem); - buildCubeAll(ActuallyBlocks.blockLaserRelayItemWhitelist); - buildCubeAll(ActuallyBlocks.blockRangedCollector); - buildCubeAll(ActuallyBlocks.blockDirectionalBreaker); - buildCubeAll(ActuallyBlocks.blockLeafGenerator); - buildCubeAll(ActuallyBlocks.blockSmileyCloud); - buildCubeAll(ActuallyBlocks.blockXPSolidifier); - buildCubeAll(ActuallyBlocks.blockTestifiBucksGreenWall); - buildCubeAll(ActuallyBlocks.blockTestifiBucksWhiteWall); - stairsBlock((StairsBlock) ActuallyBlocks.blockTestifiBucksGreenStairs.get(), modLoc("block/green_wall_block")); - stairsBlock((StairsBlock) ActuallyBlocks.blockTestifiBucksWhiteStairs.get(), modLoc("block/white_wall_block")); - slabBlock((SlabBlock) ActuallyBlocks.blockTestifiBucksGreenSlab.get(), modLoc("block/green_wall_block"), modLoc("block/green_wall_block")); - slabBlock((SlabBlock) ActuallyBlocks.blockTestifiBucksWhiteSlab.get(), modLoc("block/white_wall_block"), modLoc("block/white_wall_block")); - fenceBlock((FenceBlock) ActuallyBlocks.blockTestifiBucksGreenFence.get(), modLoc("block/green_wall_block")); - fenceBlock((FenceBlock) ActuallyBlocks.blockTestifiBucksWhiteFence.get(), modLoc("block/white_wall_block")); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_RESTONIA); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_PALIS); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_DIAMATINE); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_VOID); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC); + buildCubeAll(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI); + buildCubeAll(ActuallyBlocks.BATTERY_BOX); + buildCubeAll(ActuallyBlocks.HOPPING_ITEM_INTERFACE); + buildCubeAll(ActuallyBlocks.FARMER); + buildCubeAll(ActuallyBlocks.BIO_REACTOR); + buildCubeAll(ActuallyBlocks.EMPOWERER); + buildCubeAll(ActuallyBlocks.TINY_TORCH); + buildCubeAll(ActuallyBlocks.SHOCK_SUPPRESSOR); + buildCubeAll(ActuallyBlocks.DISPLAY_STAND); + buildCubeAll(ActuallyBlocks.PLAYER_INTERFACE); + buildCubeAll(ActuallyBlocks.ITEM_INTERFACE); + buildCubeAll(ActuallyBlocks.FIREWORK_BOX); + buildCubeAll(ActuallyBlocks.MINER); + buildCubeAll(ActuallyBlocks.ATOMIC_RECONSTRUCTOR); + buildCubeAll(ActuallyBlocks.CRYSTAL_RESTONIA); + buildCubeAll(ActuallyBlocks.CRYSTAL_PALIS); + buildCubeAll(ActuallyBlocks.CRYSTAL_DIAMATINE); + buildCubeAll(ActuallyBlocks.CRYSTAL_VOID); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMERADIC); + buildCubeAll(ActuallyBlocks.CRYSTAL_QUARTS); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC); + buildCubeAll(ActuallyBlocks.CRYSTAL_EMPOWERED_QUARTS); + buildCubeAll(ActuallyBlocks.BLACK_LOTUS); + buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY); + buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED); + buildCubeAll(ActuallyBlocks.ENERGY_LASER_RELAY_EXTREME); + buildCubeAll(ActuallyBlocks.FLUIDS_LASER_RELAY); + buildCubeAll(ActuallyBlocks.ITEM_LASER_RELAY); + buildCubeAll(ActuallyBlocks.ADVANCED_ITEM_LASER_RELAY); + buildCubeAll(ActuallyBlocks.RANGED_COLLECTOR); + buildCubeAll(ActuallyBlocks.DIRECTIONAL_BREAKER); + buildCubeAll(ActuallyBlocks.LEAF_GENERATOR); + buildCubeAll(ActuallyBlocks.SMILEY_CLOUD); + buildCubeAll(ActuallyBlocks.XP_SOLIDIFIER); + buildCubeAll(ActuallyBlocks.GREEN_WALL); + buildCubeAll(ActuallyBlocks.WHITE_WALL); + stairsBlock((StairsBlock) ActuallyBlocks.GREEN_STAIRS.get(), modLoc("block/green_wall_block")); + stairsBlock((StairsBlock) ActuallyBlocks.WHITE_STAIRS.get(), modLoc("block/white_wall_block")); + slabBlock((SlabBlock) ActuallyBlocks.GREEN_SLAB.get(), modLoc("block/green_wall_block"), modLoc("block/green_wall_block")); + slabBlock((SlabBlock) ActuallyBlocks.WHITE_SLAB.get(), modLoc("block/white_wall_block"), modLoc("block/white_wall_block")); + fenceBlock((FenceBlock) ActuallyBlocks.GREEN_FENCE.get(), modLoc("block/green_wall_block")); + fenceBlock((FenceBlock) ActuallyBlocks.WHITE_FENCE.get(), modLoc("block/white_wall_block")); buildLitState(ActuallyBlocks.LAMP_WHITE); buildLitState(ActuallyBlocks.LAMP_ORANGE); buildLitState(ActuallyBlocks.LAMP_MAGENTA); @@ -86,28 +86,28 @@ public class GeneratorBlockStates extends BlockStateProvider { buildLitState(ActuallyBlocks.LAMP_GREEN); buildLitState(ActuallyBlocks.LAMP_RED); buildLitState(ActuallyBlocks.LAMP_BLACK); - buildCubeAll(ActuallyBlocks.blockLampPowerer); - buildCubeAll(ActuallyBlocks.blockTreasureChest); - buildCubeAll(ActuallyBlocks.blockEnergizer); - buildCubeAll(ActuallyBlocks.blockEnervator); - buildCubeAll(ActuallyBlocks.blockLavaFactoryController); - buildCubeAll(ActuallyBlocks.blockCanolaPress); - buildCubeAll(ActuallyBlocks.blockPhantomface); - buildCubeAll(ActuallyBlocks.blockPhantomPlacer); - buildCubeAll(ActuallyBlocks.blockPhantomLiquiface); - buildCubeAll(ActuallyBlocks.blockPhantomEnergyface); - buildCubeAll(ActuallyBlocks.blockPhantomRedstoneface); - buildCubeAll(ActuallyBlocks.blockPhantomBreaker); - buildCubeAll(ActuallyBlocks.blockCoalGenerator); - buildCubeAll(ActuallyBlocks.blockOilGenerator); - buildCubeAll(ActuallyBlocks.blockFermentingBarrel); - buildCubeAll(ActuallyBlocks.blockRice); - buildCubeAll(ActuallyBlocks.blockCanola); - buildCubeAll(ActuallyBlocks.blockFlax); - buildCubeAll(ActuallyBlocks.blockCoffee); - buildCubeAll(ActuallyBlocks.BLACK_QUARTS); - buildCubeAll(ActuallyBlocks.BLACK_QUARTS_CHISELED); - buildCubeAll(ActuallyBlocks.BLACK_QUARTS_PILLAR); + buildCubeAll(ActuallyBlocks.LAMP_CONTROLLER); + buildCubeAll(ActuallyBlocks.TREASURE_CHEST); + buildCubeAll(ActuallyBlocks.ENERGIZER); + buildCubeAll(ActuallyBlocks.ENERVATOR); + buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); + buildCubeAll(ActuallyBlocks.CANOLA_PRESS); + buildCubeAll(ActuallyBlocks.PHANTOMFACE); + buildCubeAll(ActuallyBlocks.PHANTOM_PLACER); + buildCubeAll(ActuallyBlocks.PHANTOM_LIQUIFACE); + buildCubeAll(ActuallyBlocks.PHANTOM_ENERGYFACE); + buildCubeAll(ActuallyBlocks.PHANTOM_REDSTONEFACE); + buildCubeAll(ActuallyBlocks.PHANTOM_BREAKER); + buildCubeAll(ActuallyBlocks.COAL_GENERATOR); + buildCubeAll(ActuallyBlocks.OIL_GENERATOR); + buildCubeAll(ActuallyBlocks.FERMENTING_BARREL); + buildCubeAll(ActuallyBlocks.RICE); + buildCubeAll(ActuallyBlocks.CANOLA); + buildCubeAll(ActuallyBlocks.FLAX); + buildCubeAll(ActuallyBlocks.COFFEE); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_CHISELED); + buildCubeAll(ActuallyBlocks.BLACK_QUARTZ_PILLAR); buildCubeAll(ActuallyBlocks.CHARCOAL); buildCubeAll(ActuallyBlocks.ENDER_CASING); buildCubeAll(ActuallyBlocks.ENDERPEARL); @@ -116,34 +116,34 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CASE); buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTS); buildCubeAll(ActuallyBlocks.WOOD_CASING); - buildCubeAll(ActuallyBlocks.blockFeeder); - buildCubeAll(ActuallyBlocks.blockGrinder); - buildCubeAll(ActuallyBlocks.blockGrinderDouble); - buildCubeAll(ActuallyBlocks.blockFurnaceDouble); - buildCubeAll(ActuallyBlocks.blockInputter); - buildCubeAll(ActuallyBlocks.blockInputterAdvanced); - buildCubeAll(ActuallyBlocks.blockFishingNet); - buildCubeAll(ActuallyBlocks.blockFurnaceSolar); - buildCubeAll(ActuallyBlocks.blockHeatCollector); - buildCubeAll(ActuallyBlocks.blockItemRepairer); - buildCubeAll(ActuallyBlocks.blockGreenhouseGlass); - buildCubeAll(ActuallyBlocks.blockBreaker); - buildCubeAll(ActuallyBlocks.blockPlacer); - buildCubeAll(ActuallyBlocks.blockDropper); - buildCubeAll(ActuallyBlocks.blockFluidPlacer); - buildCubeAll(ActuallyBlocks.blockFluidCollector); - buildCubeAll(ActuallyBlocks.blockCoffeeMachine); - buildCubeAll(ActuallyBlocks.blockPhantomBooster); -// buildCubeAll(ActuallyBlocks.blockWildPlant); - wallBlock((WallBlock) ActuallyBlocks.blockQuartzWall.get(), modLoc("block/black_quartz_block")); - wallBlock((WallBlock) ActuallyBlocks.blockChiseledQuartzWall.get(), modLoc("block/black_quartz_chiseled_block")); - wallBlock((WallBlock) ActuallyBlocks.blockPillarQuartzWall.get(), modLoc("block/black_quartz_pillar_block")); - stairsBlock((StairsBlock) ActuallyBlocks.blockQuartzStair.get(), modLoc("block/black_quartz_block")); - stairsBlock((StairsBlock) ActuallyBlocks.blockChiseledQuartzStair.get(), modLoc("block/black_quartz_chiseled_block")); - stairsBlock((StairsBlock) ActuallyBlocks.blockPillarQuartzStair.get(), modLoc("block/black_quartz_pillar_block")); - slabBlock((SlabBlock) ActuallyBlocks.blockQuartzSlab.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); - slabBlock((SlabBlock) ActuallyBlocks.blockChiseledQuartzSlab.get(), modLoc("block/black_quartz_chiseled_block"), modLoc("block/black_quartz_chiseled_block")); - slabBlock((SlabBlock) ActuallyBlocks.blockPillarQuartzSlab.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); + buildCubeAll(ActuallyBlocks.FEEDER); + buildCubeAll(ActuallyBlocks.CRUSHER); + buildCubeAll(ActuallyBlocks.CRUSHER_DOUBLE); + buildCubeAll(ActuallyBlocks.POWERED_FURNACE); + buildCubeAll(ActuallyBlocks.ESD); + buildCubeAll(ActuallyBlocks.ESD_ADVANCED); + buildCubeAll(ActuallyBlocks.FISHING_NET); + buildCubeAll(ActuallyBlocks.SOLAR_PANEL); + buildCubeAll(ActuallyBlocks.HEAT_COLLECTOR); + buildCubeAll(ActuallyBlocks.ITEM_REPAIRER); + buildCubeAll(ActuallyBlocks.GREENHOUSE_GLASS); + buildCubeAll(ActuallyBlocks.BREAKER); + buildCubeAll(ActuallyBlocks.PLACER); + buildCubeAll(ActuallyBlocks.DROPPER); + buildCubeAll(ActuallyBlocks.FLUID_PLACER); + buildCubeAll(ActuallyBlocks.FLUID_COLLECTOR); + buildCubeAll(ActuallyBlocks.COFFEE_MACHINE); + buildCubeAll(ActuallyBlocks.PHANTOM_BOOSTER); +// buildCubeAll(ActuallyBlocks.WildPlant); + wallBlock((WallBlock) ActuallyBlocks.BLACK_QUARTZ_WALL.get(), modLoc("block/black_quartz_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL.get(), modLoc("block/black_quartz_chiseled_block")); + wallBlock((WallBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL.get(), modLoc("block/black_quartz_pillar_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_QUARTZ_STAIR.get(), modLoc("block/black_quartz_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR.get(), modLoc("block/black_quartz_chiseled_block")); + stairsBlock((StairsBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR.get(), modLoc("block/black_quartz_pillar_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB.get(), modLoc("block/black_quartz_chiseled_block"), modLoc("block/black_quartz_chiseled_block")); + slabBlock((SlabBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); } private void buildCubeAll(Supplier block) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index acf3d153a..8feafb2e3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -1,6 +1,7 @@ package de.ellpeck.actuallyadditions.data; import de.ellpeck.actuallyadditions.common.ActuallyAdditions; +import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlocks; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.LanguageProvider; @@ -11,7 +12,136 @@ public class GeneratorLanguage extends LanguageProvider { @Override protected void addTranslations() { + // Blocks (kill me) + addBlock(ActuallyBlocks.BLACK_LOTUS, "Black lotus"); + addBlock(ActuallyBlocks.RICE, "Rice"); + addBlock(ActuallyBlocks.CANOLA, "Canola"); + addBlock(ActuallyBlocks.FLAX, "Flax"); + addBlock(ActuallyBlocks.COFFEE, "Coffee"); + addBlock(ActuallyBlocks.BATTERY_BOX, "Battery Box"); + addBlock(ActuallyBlocks.HOPPING_ITEM_INTERFACE, "Hopping Item Interface"); + addBlock(ActuallyBlocks.FARMER, "Farmer"); + addBlock(ActuallyBlocks.BIO_REACTOR, "Bio Reactor"); + addBlock(ActuallyBlocks.EMPOWERER, "Empowerer"); + addBlock(ActuallyBlocks.TINY_TORCH, "Tiny Torch"); + addBlock(ActuallyBlocks.SHOCK_SUPPRESSOR, "Shock"); + addBlock(ActuallyBlocks.DISPLAY_STAND, "Display Stand"); + addBlock(ActuallyBlocks.PLAYER_INTERFACE, "Player Interface"); + addBlock(ActuallyBlocks.ITEM_INTERFACE, "Item Interface"); + addBlock(ActuallyBlocks.FIREWORK_BOX, "Firework Box"); + addBlock(ActuallyBlocks.MINER, "Miner"); + addBlock(ActuallyBlocks.ATOMIC_RECONSTRUCTOR, "Atomic Reconstructor"); + addBlock(ActuallyBlocks.TREASURE_CHEST, "Treasure Chest"); + addBlock(ActuallyBlocks.ENERGIZER, "Energizer"); + addBlock(ActuallyBlocks.ENERVATOR, "Enervator"); + addBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER, "Lava Factory Controller"); + addBlock(ActuallyBlocks.CANOLA_PRESS, "Conola Press"); + addBlock(ActuallyBlocks.PHANTOMFACE, "Phantomface"); + addBlock(ActuallyBlocks.PHANTOM_PLACER, "Phantom Placer"); + addBlock(ActuallyBlocks.PHANTOM_LIQUIFACE, "Phantom Liquiface"); + addBlock(ActuallyBlocks.PHANTOM_ENERGYFACE, "Phantom Energyface"); + addBlock(ActuallyBlocks.PHANTOM_REDSTONEFACE, "Phantom Restoneface"); + addBlock(ActuallyBlocks.PHANTOM_BREAKER, "Phantom Breaker"); + addBlock(ActuallyBlocks.COAL_GENERATOR, "Coal Generator"); + addBlock(ActuallyBlocks.OIL_GENERATOR, "Oil Generator"); + addBlock(ActuallyBlocks.FERMENTING_BARREL, "Fermenting Barrel"); + addBlock(ActuallyBlocks.FEEDER, "Feeder"); + addBlock(ActuallyBlocks.CRUSHER, "Grinder"); + addBlock(ActuallyBlocks.CRUSHER_DOUBLE, "Double Crusher"); + addBlock(ActuallyBlocks.POWERED_FURNACE, "Powered Furnace"); + addBlock(ActuallyBlocks.ESD, "ESD"); + addBlock(ActuallyBlocks.ESD_ADVANCED, "Advanced ASD"); + addBlock(ActuallyBlocks.FISHING_NET, "Fishing Net"); + addBlock(ActuallyBlocks.SOLAR_PANEL, "Solar Panel"); + addBlock(ActuallyBlocks.HEAT_COLLECTOR, "Heat Collector"); + addBlock(ActuallyBlocks.ITEM_REPAIRER, "Item Repairer"); + addBlock(ActuallyBlocks.GREENHOUSE_GLASS, "Greenhouse Glass"); + addBlock(ActuallyBlocks.BREAKER, "Auto-Breaker"); + addBlock(ActuallyBlocks.PLACER, "Auto-Placer"); + addBlock(ActuallyBlocks.DROPPER, "Precision Dropper"); + addBlock(ActuallyBlocks.FLUID_PLACER, "Fluid Placer"); + addBlock(ActuallyBlocks.FLUID_COLLECTOR, "Fluid Collector"); + addBlock(ActuallyBlocks.COFFEE_MACHINE, "Coffee Machine"); + addBlock(ActuallyBlocks.PHANTOM_BOOSTER, "Phantom Booster"); + addBlock(ActuallyBlocks.CRYSTAL_QUARTS, "?"); + addBlock(ActuallyBlocks.CRYSTAL_RESTONIA, "Block of Restonia Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_PALIS, "Block of Palis Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_DIAMATINE, "Block of Diamatine Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_VOID, "Block of Void Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMERADIC, "Block of Emeradic Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_QUARTS, ""); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_RESTONIA, "Block of Empowered Restonia Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_PALIS, "Block of Empowered Palis Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_DIAMATINE, "Block of Empowered Diamatine Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_VOID, "Block of Empowered Void Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_EMPOWERED_EMERADIC, "Block of Empowered Emeradic Crystals"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_RESTONIA, "Restonia Crystal Cluster"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_PALIS, "Palis Crystal Cluster"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_DIAMATINE, "Diamatine Crystal Cluster"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_VOID, "Void Crystal Cluster"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_EMERADIC, "Emeradic Crystal Cluster"); + addBlock(ActuallyBlocks.CRYSTAL_CLUSTER_ENORI, "Enori Crystal Cluster"); + addBlock(ActuallyBlocks.ENERGY_LASER_RELAY, "Energy Laser relay"); + addBlock(ActuallyBlocks.ENERGY_LASER_RELAY_ADVANCED, "Advanced Energy Laser Relay"); + addBlock(ActuallyBlocks.ENERGY_LASER_RELAY_EXTREME, "Extreme Energy Laser Relay"); + addBlock(ActuallyBlocks.FLUIDS_LASER_RELAY, "Fluid Laser Relay"); + addBlock(ActuallyBlocks.ITEM_LASER_RELAY, "Item Laser Relay"); + addBlock(ActuallyBlocks.ADVANCED_ITEM_LASER_RELAY, "Advanced Item Laser Relay"); + addBlock(ActuallyBlocks.RANGED_COLLECTOR, "Ranged Collector"); + addBlock(ActuallyBlocks.DIRECTIONAL_BREAKER, "Directional Breaker"); + addBlock(ActuallyBlocks.LEAF_GENERATOR, "Leaf Generator"); + addBlock(ActuallyBlocks.SMILEY_CLOUD, "Smiley Cloud"); + addBlock(ActuallyBlocks.XP_SOLIDIFIER, "XP Solidifier"); + addBlock(ActuallyBlocks.GREEN_WALL, "Ethentic Green Wall"); + addBlock(ActuallyBlocks.WHITE_WALL, "Ethentic Quartz Wall"); + addBlock(ActuallyBlocks.GREEN_STAIRS, "Ethentic Green Stairs"); + addBlock(ActuallyBlocks.WHITE_STAIRS, "Ethentic Quartz Stairs"); + addBlock(ActuallyBlocks.GREEN_SLAB, "Ethentic Green Slab"); + addBlock(ActuallyBlocks.WHITE_SLAB, "Ethentic Quartz Slab"); + addBlock(ActuallyBlocks.GREEN_FENCE, "Ethentic Green Fence"); + addBlock(ActuallyBlocks.WHITE_FENCE, "Ethentic Quartz Fence"); + addBlock(ActuallyBlocks.BLACK_QUARTZ, "Block of Black Quartz"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_CHISELED, "Chiseled Black Quartz"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_PILLAR, "Black Quartz Pillar"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_WALL, "Black Quartz Wall"); + addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_WALL, "Chiseled Black Quartz Wall"); + addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_WALL, "Black Quartz Wall Pillar"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_STAIR, "Black Quartz Stairs"); + addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_STAIR, "Chiseled Black Quartz Stairs"); + addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_STAIR, "Black Quartz Pillar Stairs"); + addBlock(ActuallyBlocks.BLACK_QUARTZ_SLAB, "Black Quartz Slab"); + addBlock(ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB, "Chiseled Black Quartz Slab"); + addBlock(ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB, "Black Quartz Pillar Slab"); + addBlock(ActuallyBlocks.LAMP_WHITE, "White Lamp"); + addBlock(ActuallyBlocks.LAMP_ORANGE, "Orange Lamp"); + addBlock(ActuallyBlocks.LAMP_MAGENTA, "Magenta Lamp"); + addBlock(ActuallyBlocks.LAMP_LIGHT_BLUE, "Light Blue Lamp"); + addBlock(ActuallyBlocks.LAMP_YELLOW, "Yellow Lamp"); + addBlock(ActuallyBlocks.LAMP_LIME, "Lime Lamp"); + addBlock(ActuallyBlocks.LAMP_PINK, "Pink Lamp"); + addBlock(ActuallyBlocks.LAMP_GRAY, "Gray Lamp"); + addBlock(ActuallyBlocks.LAMP_LIGHT_GRAY, "Light Gray Lamp"); + addBlock(ActuallyBlocks.LAMP_CYAN, "Cyan Lamp"); + addBlock(ActuallyBlocks.LAMP_PURPLE, "Purple Lamp"); + addBlock(ActuallyBlocks.LAMP_BLUE, "Blue Lamp"); + addBlock(ActuallyBlocks.LAMP_BROWN, "Brown Lamp"); + addBlock(ActuallyBlocks.LAMP_GREEN, "Green Lamp"); + addBlock(ActuallyBlocks.LAMP_RED, "Red Lamp"); + addBlock(ActuallyBlocks.LAMP_BLACK, "Black Lamp"); + addBlock(ActuallyBlocks.LAMP_CONTROLLER, "Lamp Controller"); + addBlock(ActuallyBlocks.ENDERPEARL, "Block of Ender Pearls"); + addBlock(ActuallyBlocks.CHARCOAL, "Charcoal"); + addBlock(ActuallyBlocks.ORE_BLACK_QUARTS, "Black Quartz Ore"); + addBlock(ActuallyBlocks.ENDER_CASING, "Ender Casing"); + addBlock(ActuallyBlocks.IRON_CASING, "Iron Casing"); + addBlock(ActuallyBlocks.IRON_CASING_SNOW, "?"); + addBlock(ActuallyBlocks.LAVA_FACTORY_CASE, "Casing"); + addBlock(ActuallyBlocks.WOOD_CASING, "Wood Casing"); + add("itemGroup.actuallyadditions", "Actually Additions"); + + // Mics + add("misc.message.so_cute", "So cute!"); } /**