diff --git a/src/main/generated/assets/galacticraft/models/item/air_lock_seal.json b/src/main/generated/assets/galacticraft/models/item/air_lock_seal.json deleted file mode 100644 index 0a40e6e2c..000000000 --- a/src/main/generated/assets/galacticraft/models/item/air_lock_seal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "galacticraft:block/air_lock_seal" -} \ No newline at end of file diff --git a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java index bcee238ad..e5b944d9c 100644 --- a/src/main/java/dev/galacticraft/mod/content/GCBlocks.java +++ b/src/main/java/dev/galacticraft/mod/content/GCBlocks.java @@ -46,8 +46,6 @@ import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.FlattenableBlockRegistry; import net.minecraft.core.BlockPos; -import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.util.valueproviders.ConstantInt; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.*; @@ -66,14 +64,14 @@ public class GCBlocks { // TORCHES // These 2 torches are special, it's need to register early so others can use dropsLike() reference - public static final Block GLOWSTONE_TORCH = register(Constant.Block.GLOWSTONE_TORCH, new GlowstoneTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel(blockStatex -> 14).sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY))); - public static final Block UNLIT_TORCH = register(Constant.Block.UNLIT_TORCH, new UnlitTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel(blockStatex -> 0).sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY))); + public static final Block GLOWSTONE_TORCH = BLOCKS.register(Constant.Block.GLOWSTONE_TORCH, new GlowstoneTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel(blockStatex -> 14).sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY))); + public static final Block UNLIT_TORCH = BLOCKS.register(Constant.Block.UNLIT_TORCH, new UnlitTorchBlock(BlockBehaviour.Properties.of().noCollission().instabreak().lightLevel(blockStatex -> 0).sound(SoundType.WOOD).pushReaction(PushReaction.DESTROY))); public static final Block GLOWSTONE_WALL_TORCH = BLOCKS.register(Constant.Block.GLOWSTONE_WALL_TORCH, new GlowstoneWallTorchBlock(BlockBehaviour.Properties.ofFullCopy(GLOWSTONE_TORCH).dropsLike(GLOWSTONE_TORCH))); public static final Block UNLIT_WALL_TORCH = BLOCKS.register(Constant.Block.UNLIT_WALL_TORCH, new UnlitWallTorchBlock(BlockBehaviour.Properties.ofFullCopy(UNLIT_TORCH).dropsLike(UNLIT_TORCH))); // LANTERNS - public static final Block GLOWSTONE_LANTERN = BLOCKS.register(Constant.Block.GLOWSTONE_LANTERN, new GlowstoneLanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN))); - public static final Block UNLIT_LANTERN = BLOCKS.register(Constant.Block.UNLIT_LANTERN, new UnlitLanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN).lightLevel(state -> 0))); + public static final Block GLOWSTONE_LANTERN = BLOCKS.registerWithItem(Constant.Block.GLOWSTONE_LANTERN, new GlowstoneLanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN))); + public static final Block UNLIT_LANTERN = BLOCKS.registerWithItem(Constant.Block.UNLIT_LANTERN, new UnlitLanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN).lightLevel(state -> 0))); // FLUIDS public static final LiquidBlock CRUDE_OIL = BLOCKS.register(Constant.Block.CRUDE_OIL, @@ -103,150 +101,150 @@ public class GCBlocks { public static final DecorationSet DARK_DECORATION = BLOCKS.registerDecoration(Constant.Block.DARK_DECORATION, BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 3.0F).requiresCorrectToolForDrops(), 2.5F, 3.0F); // MOON NATURAL - public static final Block MOON_TURF = BLOCKS.register(Constant.Block.MOON_TURF, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.5F, 0.5F))); - public static final Block MOON_DIRT = BLOCKS.register(Constant.Block.MOON_DIRT, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.5F, 0.5F).sound(SoundType.GRAVEL))); - public static final Block MOON_DIRT_PATH = BLOCKS.register(Constant.Block.MOON_DIRT_PATH, new MoonDirtPathBlock(BlockBehaviour.Properties.ofFullCopy(MOON_DIRT).strength(0.5F, 0.5F))); - public static final Block MOON_SURFACE_ROCK = BLOCKS.register(Constant.Block.MOON_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_TURF = BLOCKS.registerWithItem(Constant.Block.MOON_TURF, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.5F, 0.5F))); + public static final Block MOON_DIRT = BLOCKS.registerWithItem(Constant.Block.MOON_DIRT, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).strength(0.5F, 0.5F).sound(SoundType.GRAVEL))); + public static final Block MOON_DIRT_PATH = BLOCKS.registerWithItem(Constant.Block.MOON_DIRT_PATH, new MoonDirtPathBlock(BlockBehaviour.Properties.ofFullCopy(MOON_DIRT).strength(0.5F, 0.5F))); + public static final Block MOON_SURFACE_ROCK = BLOCKS.registerWithItem(Constant.Block.MOON_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); public static final Block MOON_DUNGEON_BRICK = BLOCKS.registerWithItem(Constant.Block.MOON_DUNGEON_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 2.5F).requiresCorrectToolForDrops())); - public static final Block MOON_ROCK = BLOCKS.register(Constant.Block.MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block MOON_ROCK_SLAB = BLOCKS.register(Constant.Block.MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK).strength(2.5F, 6.0F))); - public static final Block MOON_ROCK_STAIRS = BLOCKS.register(Constant.Block.MOON_ROCK_STAIRS, new StairBlock(MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_ROCK))); - public static final Block MOON_ROCK_WALL = BLOCKS.register(Constant.Block.MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK))); - - public static final Block MOON_ROCK_BRICK = BLOCKS.register(Constant.Block.MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block MOON_ROCK_BRICK_SLAB = BLOCKS.register(Constant.Block.MOON_ROCK_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK).strength(2.5F, 6.0F))); - public static final Block MOON_ROCK_BRICK_STAIRS = BLOCKS.register(Constant.Block.MOON_ROCK_BRICK_STAIRS, new StairBlock(MOON_ROCK_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK))); - public static final Block MOON_ROCK_BRICK_WALL = BLOCKS.register(Constant.Block.MOON_ROCK_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK))); - - public static final Block CRACKED_MOON_ROCK_BRICK = BLOCKS.register(Constant.Block.CRACKED_MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block CRACKED_MOON_ROCK_BRICK_SLAB = BLOCKS.register(Constant.Block.CRACKED_MOON_ROCK_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK).strength(2.5F, 6.0F))); - public static final Block CRACKED_MOON_ROCK_BRICK_STAIRS = BLOCKS.register(Constant.Block.CRACKED_MOON_ROCK_BRICK_STAIRS, new StairBlock(CRACKED_MOON_ROCK_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK))); - public static final Block CRACKED_MOON_ROCK_BRICK_WALL = BLOCKS.register(Constant.Block.CRACKED_MOON_ROCK_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK))); - - public static final Block POLISHED_MOON_ROCK = BLOCKS.register(Constant.Block.POLISHED_MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block POLISHED_MOON_ROCK_SLAB = BLOCKS.register(Constant.Block.POLISHED_MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK).strength(2.5F, 6.0F))); - public static final Block POLISHED_MOON_ROCK_STAIRS = BLOCKS.register(Constant.Block.POLISHED_MOON_ROCK_STAIRS, new StairBlock(POLISHED_MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK))); - public static final Block POLISHED_MOON_ROCK_WALL = BLOCKS.register(Constant.Block.POLISHED_MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK))); - - public static final Block CHISELED_MOON_ROCK_BRICK = BLOCKS.register(Constant.Block.CHISELED_MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block MOON_ROCK_PILLAR = BLOCKS.register(Constant.Block.MOON_ROCK_PILLAR, new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - - public static final Block COBBLED_MOON_ROCK = BLOCKS.register(Constant.Block.COBBLED_MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block COBBLED_MOON_ROCK_SLAB = BLOCKS.register(Constant.Block.COBBLED_MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK).strength(2.5F, 6.0F))); - public static final Block COBBLED_MOON_ROCK_STAIRS = BLOCKS.register(Constant.Block.COBBLED_MOON_ROCK_STAIRS, new StairBlock(COBBLED_MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK))); - public static final Block COBBLED_MOON_ROCK_WALL = BLOCKS.register(Constant.Block.COBBLED_MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK))); - - public static final Block LUNASLATE = BLOCKS.register(Constant.Block.LUNASLATE, new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).instrument(NoteBlockInstrument.BASEDRUM).strength(3.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.DEEPSLATE))); - public static final Block LUNASLATE_SLAB = BLOCKS.register(Constant.Block.LUNASLATE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); - public static final Block LUNASLATE_STAIRS = BLOCKS.register(Constant.Block.LUNASLATE_STAIRS, new StairBlock(LUNASLATE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); - public static final Block LUNASLATE_WALL = BLOCKS.register(Constant.Block.LUNASLATE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); - - public static final Block COBBLED_LUNASLATE = BLOCKS.register(Constant.Block.COBBLED_LUNASLATE, new Block(BlockBehaviour.Properties.ofFullCopy(LUNASLATE).strength(3.5F, 6.0F))); - public static final Block COBBLED_LUNASLATE_SLAB = BLOCKS.register(Constant.Block.COBBLED_LUNASLATE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); - public static final Block COBBLED_LUNASLATE_STAIRS = BLOCKS.register(Constant.Block.COBBLED_LUNASLATE_STAIRS, new StairBlock(COBBLED_LUNASLATE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); - public static final Block COBBLED_LUNASLATE_WALL = BLOCKS.register(Constant.Block.COBBLED_LUNASLATE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); - - public static final Block MOON_BASALT = BLOCKS.register(Constant.Block.MOON_BASALT, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block MOON_BASALT_SLAB = BLOCKS.register(Constant.Block.MOON_BASALT_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT).strength(2.5F, 6.0F))); - public static final Block MOON_BASALT_STAIRS = BLOCKS.register(Constant.Block.MOON_BASALT_STAIRS, new StairBlock(MOON_BASALT.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_BASALT))); - public static final Block MOON_BASALT_WALL = BLOCKS.register(Constant.Block.MOON_BASALT_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT))); - - public static final Block MOON_BASALT_BRICK = BLOCKS.register(Constant.Block.MOON_BASALT_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.5F, 6.0F).requiresCorrectToolForDrops())); - public static final Block MOON_BASALT_BRICK_SLAB = BLOCKS.register(Constant.Block.MOON_BASALT_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK).strength(3.0F, 6.0F))); - public static final Block MOON_BASALT_BRICK_STAIRS = BLOCKS.register(Constant.Block.MOON_BASALT_BRICK_STAIRS, new StairBlock(MOON_BASALT_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK))); - public static final Block MOON_BASALT_BRICK_WALL = BLOCKS.register(Constant.Block.MOON_BASALT_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK))); - - public static final Block CRACKED_MOON_BASALT_BRICK = BLOCKS.register(Constant.Block.CRACKED_MOON_BASALT_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final Block CRACKED_MOON_BASALT_BRICK_SLAB = BLOCKS.register(Constant.Block.CRACKED_MOON_BASALT_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK).strength(2.5F, 6.0F))); - public static final Block CRACKED_MOON_BASALT_BRICK_STAIRS = BLOCKS.register(Constant.Block.CRACKED_MOON_BASALT_BRICK_STAIRS, new StairBlock(CRACKED_MOON_BASALT_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK))); - public static final Block CRACKED_MOON_BASALT_BRICK_WALL = BLOCKS.register(Constant.Block.CRACKED_MOON_BASALT_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK))); - - public static final Block FALLEN_METEOR = BLOCKS.register(Constant.Block.FALLEN_METEOR, new FallenMeteorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).randomTicks().noOcclusion().sound(SoundType.BASALT).requiresCorrectToolForDrops())); + public static final Block MOON_ROCK = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_ROCK_SLAB = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK).strength(2.5F, 6.0F))); + public static final Block MOON_ROCK_STAIRS = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_STAIRS, new StairBlock(MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_ROCK))); + public static final Block MOON_ROCK_WALL = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK))); + + public static final Block MOON_ROCK_BRICK = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_ROCK_BRICK_SLAB = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK).strength(2.5F, 6.0F))); + public static final Block MOON_ROCK_BRICK_STAIRS = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_BRICK_STAIRS, new StairBlock(MOON_ROCK_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK))); + public static final Block MOON_ROCK_BRICK_WALL = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_ROCK_BRICK))); + + public static final Block CRACKED_MOON_ROCK_BRICK = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block CRACKED_MOON_ROCK_BRICK_SLAB = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_ROCK_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK).strength(2.5F, 6.0F))); + public static final Block CRACKED_MOON_ROCK_BRICK_STAIRS = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_ROCK_BRICK_STAIRS, new StairBlock(CRACKED_MOON_ROCK_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK))); + public static final Block CRACKED_MOON_ROCK_BRICK_WALL = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_ROCK_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_ROCK_BRICK))); + + public static final Block POLISHED_MOON_ROCK = BLOCKS.registerWithItem(Constant.Block.POLISHED_MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block POLISHED_MOON_ROCK_SLAB = BLOCKS.registerWithItem(Constant.Block.POLISHED_MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK).strength(2.5F, 6.0F))); + public static final Block POLISHED_MOON_ROCK_STAIRS = BLOCKS.registerWithItem(Constant.Block.POLISHED_MOON_ROCK_STAIRS, new StairBlock(POLISHED_MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK))); + public static final Block POLISHED_MOON_ROCK_WALL = BLOCKS.registerWithItem(Constant.Block.POLISHED_MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(POLISHED_MOON_ROCK))); + + public static final Block CHISELED_MOON_ROCK_BRICK = BLOCKS.registerWithItem(Constant.Block.CHISELED_MOON_ROCK_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_ROCK_PILLAR = BLOCKS.registerWithItem(Constant.Block.MOON_ROCK_PILLAR, new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + + public static final Block COBBLED_MOON_ROCK = BLOCKS.registerWithItem(Constant.Block.COBBLED_MOON_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block COBBLED_MOON_ROCK_SLAB = BLOCKS.registerWithItem(Constant.Block.COBBLED_MOON_ROCK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK).strength(2.5F, 6.0F))); + public static final Block COBBLED_MOON_ROCK_STAIRS = BLOCKS.registerWithItem(Constant.Block.COBBLED_MOON_ROCK_STAIRS, new StairBlock(COBBLED_MOON_ROCK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK))); + public static final Block COBBLED_MOON_ROCK_WALL = BLOCKS.registerWithItem(Constant.Block.COBBLED_MOON_ROCK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_MOON_ROCK))); + + public static final Block LUNASLATE = BLOCKS.registerWithItem(Constant.Block.LUNASLATE, new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).instrument(NoteBlockInstrument.BASEDRUM).strength(3.0F, 6.0F).requiresCorrectToolForDrops().sound(SoundType.DEEPSLATE))); + public static final Block LUNASLATE_SLAB = BLOCKS.registerWithItem(Constant.Block.LUNASLATE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); + public static final Block LUNASLATE_STAIRS = BLOCKS.registerWithItem(Constant.Block.LUNASLATE_STAIRS, new StairBlock(LUNASLATE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); + public static final Block LUNASLATE_WALL = BLOCKS.registerWithItem(Constant.Block.LUNASLATE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(LUNASLATE))); + + public static final Block COBBLED_LUNASLATE = BLOCKS.registerWithItem(Constant.Block.COBBLED_LUNASLATE, new Block(BlockBehaviour.Properties.ofFullCopy(LUNASLATE).strength(3.5F, 6.0F))); + public static final Block COBBLED_LUNASLATE_SLAB = BLOCKS.registerWithItem(Constant.Block.COBBLED_LUNASLATE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); + public static final Block COBBLED_LUNASLATE_STAIRS = BLOCKS.registerWithItem(Constant.Block.COBBLED_LUNASLATE_STAIRS, new StairBlock(COBBLED_LUNASLATE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); + public static final Block COBBLED_LUNASLATE_WALL = BLOCKS.registerWithItem(Constant.Block.COBBLED_LUNASLATE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(COBBLED_LUNASLATE))); + + public static final Block MOON_BASALT = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_BASALT_SLAB = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT).strength(2.5F, 6.0F))); + public static final Block MOON_BASALT_STAIRS = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_STAIRS, new StairBlock(MOON_BASALT.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_BASALT))); + public static final Block MOON_BASALT_WALL = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT))); + + public static final Block MOON_BASALT_BRICK = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.5F, 6.0F).requiresCorrectToolForDrops())); + public static final Block MOON_BASALT_BRICK_SLAB = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK).strength(3.0F, 6.0F))); + public static final Block MOON_BASALT_BRICK_STAIRS = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_BRICK_STAIRS, new StairBlock(MOON_BASALT_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK))); + public static final Block MOON_BASALT_BRICK_WALL = BLOCKS.registerWithItem(Constant.Block.MOON_BASALT_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT_BRICK))); + + public static final Block CRACKED_MOON_BASALT_BRICK = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_BASALT_BRICK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BLACK).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + public static final Block CRACKED_MOON_BASALT_BRICK_SLAB = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_BASALT_BRICK_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK).strength(2.5F, 6.0F))); + public static final Block CRACKED_MOON_BASALT_BRICK_STAIRS = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_BASALT_BRICK_STAIRS, new StairBlock(CRACKED_MOON_BASALT_BRICK.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK))); + public static final Block CRACKED_MOON_BASALT_BRICK_WALL = BLOCKS.registerWithItem(Constant.Block.CRACKED_MOON_BASALT_BRICK_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(CRACKED_MOON_BASALT_BRICK))); + + public static final Block FALLEN_METEOR = BLOCKS.registerWithItem(Constant.Block.FALLEN_METEOR, new FallenMeteorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.0F, 6.0F).randomTicks().noOcclusion().sound(SoundType.BASALT).requiresCorrectToolForDrops())); // MARS NATURAL - public static final Block MARS_SURFACE_ROCK = BLOCKS.register(Constant.Block.MARS_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(2.2F).requiresCorrectToolForDrops())); - public static final Block MARS_SUB_SURFACE_ROCK = BLOCKS.register(Constant.Block.MARS_SUB_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(2.6F).requiresCorrectToolForDrops())); + public static final Block MARS_SURFACE_ROCK = BLOCKS.registerWithItem(Constant.Block.MARS_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DIRT).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(2.2F).requiresCorrectToolForDrops())); + public static final Block MARS_SUB_SURFACE_ROCK = BLOCKS.registerWithItem(Constant.Block.MARS_SUB_SURFACE_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(2.6F).requiresCorrectToolForDrops())); - public static final Block MARS_STONE = BLOCKS.register(Constant.Block.MARS_STONE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); - public static final Block MARS_STONE_SLAB = BLOCKS.register(Constant.Block.MARS_STONE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MARS_STONE).strength(3.5F, 6.0F))); - public static final Block MARS_STONE_STAIRS = BLOCKS.register(Constant.Block.MARS_STONE_STAIRS, new StairBlock(MARS_STONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MARS_STONE))); - public static final Block MARS_STONE_WALL = BLOCKS.register(Constant.Block.MARS_STONE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MARS_STONE))); + public static final Block MARS_STONE = BLOCKS.registerWithItem(Constant.Block.MARS_STONE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); + public static final Block MARS_STONE_SLAB = BLOCKS.registerWithItem(Constant.Block.MARS_STONE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MARS_STONE).strength(3.5F, 6.0F))); + public static final Block MARS_STONE_STAIRS = BLOCKS.registerWithItem(Constant.Block.MARS_STONE_STAIRS, new StairBlock(MARS_STONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MARS_STONE))); + public static final Block MARS_STONE_WALL = BLOCKS.registerWithItem(Constant.Block.MARS_STONE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MARS_STONE))); - public static final Block MARS_COBBLESTONE = BLOCKS.register(Constant.Block.MARS_COBBLESTONE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); - public static final Block MARS_COBBLESTONE_SLAB = BLOCKS.register(Constant.Block.MARS_COBBLESTONE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE).strength(3.5F, 6.0F))); - public static final Block MARS_COBBLESTONE_STAIRS = BLOCKS.register(Constant.Block.MARS_COBBLESTONE_STAIRS, new StairBlock(MARS_COBBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE))); - public static final Block MARS_COBBLESTONE_WALL = BLOCKS.register(Constant.Block.MARS_COBBLESTONE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE))); + public static final Block MARS_COBBLESTONE = BLOCKS.registerWithItem(Constant.Block.MARS_COBBLESTONE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_RED).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); + public static final Block MARS_COBBLESTONE_SLAB = BLOCKS.registerWithItem(Constant.Block.MARS_COBBLESTONE_SLAB, new SlabBlock(BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE).strength(3.5F, 6.0F))); + public static final Block MARS_COBBLESTONE_STAIRS = BLOCKS.registerWithItem(Constant.Block.MARS_COBBLESTONE_STAIRS, new StairBlock(MARS_COBBLESTONE.defaultBlockState(), BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE))); + public static final Block MARS_COBBLESTONE_WALL = BLOCKS.registerWithItem(Constant.Block.MARS_COBBLESTONE_WALL, new WallBlock(BlockBehaviour.Properties.ofFullCopy(MARS_COBBLESTONE))); // ASTEROID NATURAL - public static final Block ASTEROID_ROCK = BLOCKS.register(Constant.Block.ASTEROID_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); - public static final Block ASTEROID_ROCK_1 = BLOCKS.register(Constant.Block.ASTEROID_ROCK_1, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); // todo naming - public static final Block ASTEROID_ROCK_2 = BLOCKS.register(Constant.Block.ASTEROID_ROCK_2, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); + public static final Block ASTEROID_ROCK = BLOCKS.registerWithItem(Constant.Block.ASTEROID_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); + public static final Block ASTEROID_ROCK_1 = BLOCKS.registerWithItem(Constant.Block.ASTEROID_ROCK_1, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); // todo naming + public static final Block ASTEROID_ROCK_2 = BLOCKS.registerWithItem(Constant.Block.ASTEROID_ROCK_2, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).destroyTime(3.0F).requiresCorrectToolForDrops())); // VENUS NATURAL - public static final Block SOFT_VENUS_ROCK = BLOCKS.register(Constant.Block.SOFT_VENUS_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F))); - public static final Block HARD_VENUS_ROCK = BLOCKS.register(Constant.Block.HARD_VENUS_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); - public static final Block SCORCHED_VENUS_ROCK = BLOCKS.register(Constant.Block.SCORCHED_VENUS_ROCK, new ScorchedRockBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); - public static final Block VOLCANIC_ROCK = BLOCKS.register(Constant.Block.VOLCANIC_ROCK, new VolcanicRockBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.2F, 0.5F).requiresCorrectToolForDrops())); - public static final Block PUMICE = BLOCKS.register(Constant.Block.PUMICE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); - public static final Block VAPOR_SPOUT = BLOCKS.register(Constant.Block.VAPOR_SPOUT, new VaporSpoutBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 2.0F).requiresCorrectToolForDrops())); + public static final Block SOFT_VENUS_ROCK = BLOCKS.registerWithItem(Constant.Block.SOFT_VENUS_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F))); + public static final Block HARD_VENUS_ROCK = BLOCKS.registerWithItem(Constant.Block.HARD_VENUS_ROCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); + public static final Block SCORCHED_VENUS_ROCK = BLOCKS.registerWithItem(Constant.Block.SCORCHED_VENUS_ROCK, new ScorchedRockBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); + public static final Block VOLCANIC_ROCK = BLOCKS.registerWithItem(Constant.Block.VOLCANIC_ROCK, new VolcanicRockBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(2.2F, 0.5F).requiresCorrectToolForDrops())); + public static final Block PUMICE = BLOCKS.registerWithItem(Constant.Block.PUMICE, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F).requiresCorrectToolForDrops())); + public static final Block VAPOR_SPOUT = BLOCKS.registerWithItem(Constant.Block.VAPOR_SPOUT, new VaporSpoutBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BROWN).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 2.0F).requiresCorrectToolForDrops())); // MISC DECOR - public static final Block WALKWAY = BLOCKS.register(Constant.Block.WALKWAY, new WalkwayBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0f, 5.0f).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block FLUID_PIPE_WALKWAY = BLOCKS.register(Constant.Block.FLUID_PIPE_WALKWAY, new FluidPipeWalkway(BlockBehaviour.Properties.ofFullCopy(WALKWAY))); - public static final Block WIRE_WALKWAY = BLOCKS.register(Constant.Block.WIRE_WALKWAY, new WireWalkway(BlockBehaviour.Properties.ofFullCopy(WALKWAY))); - public static final Block TIN_LADDER = BLOCKS.register(Constant.Block.TIN_LADDER, new TinLadderBlock(BlockBehaviour.Properties.of().forceSolidOff().noOcclusion().pushReaction(PushReaction.DESTROY).strength(1.0f, 1.0f).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block IRON_GRATING = BLOCKS.register(Constant.Block.IRON_GRATING, new IronGratingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(2.5f, 6.0f).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion())); + public static final Block WALKWAY = BLOCKS.registerWithItem(Constant.Block.WALKWAY, new WalkwayBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0f, 5.0f).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block FLUID_PIPE_WALKWAY = BLOCKS.registerWithItem(Constant.Block.FLUID_PIPE_WALKWAY, new FluidPipeWalkway(BlockBehaviour.Properties.ofFullCopy(WALKWAY))); + public static final Block WIRE_WALKWAY = BLOCKS.registerWithItem(Constant.Block.WIRE_WALKWAY, new WireWalkway(BlockBehaviour.Properties.ofFullCopy(WALKWAY))); + public static final Block TIN_LADDER = BLOCKS.registerWithItem(Constant.Block.TIN_LADDER, new TinLadderBlock(BlockBehaviour.Properties.of().forceSolidOff().noOcclusion().pushReaction(PushReaction.DESTROY).strength(1.0f, 1.0f).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block IRON_GRATING = BLOCKS.registerWithItem(Constant.Block.IRON_GRATING, new IronGratingBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(2.5f, 6.0f).sound(SoundType.METAL).requiresCorrectToolForDrops().noOcclusion())); // SPECIAL - public static final Block ALUMINUM_WIRE = BLOCKS.register(Constant.Block.ALUMINUM_WIRE, new AluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WHITE_WOOL))); - public static final Block SEALABLE_ALUMINUM_WIRE = BLOCKS.register(Constant.Block.SEALABLE_ALUMINUM_WIRE, new SealableAluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(TIN_DECORATION.block()))); - public static final Block HEAVY_SEALABLE_ALUMINUM_WIRE = BLOCKS.register(Constant.Block.HEAVY_SEALABLE_ALUMINUM_WIRE, new HeavySealableAluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(TIN_DECORATION.block()))); - public static final Block GLASS_FLUID_PIPE = BLOCKS.register(Constant.Block.GLASS_FLUID_PIPE, new GlassFluidPipeBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.HAT).sound(SoundType.GLASS).requiresCorrectToolForDrops())); - public static final Block FUELING_PAD = BLOCKS.register(Constant.Block.FUELING_PAD, new FuelPadBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 10.0F).requiresCorrectToolForDrops())); - public static final Block ROCKET_LAUNCH_PAD = BLOCKS.register(Constant.Block.ROCKET_LAUNCH_PAD, new LaunchPadBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 10.0F).requiresCorrectToolForDrops())); - public static final Block ROCKET_WORKBENCH = BLOCKS.register(Constant.Block.ROCKET_WORKBENCH, new RocketWorkbench(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F))); + public static final Block ALUMINUM_WIRE = BLOCKS.registerWithItem(Constant.Block.ALUMINUM_WIRE, new AluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.WHITE_WOOL))); + public static final Block SEALABLE_ALUMINUM_WIRE = BLOCKS.registerWithItem(Constant.Block.SEALABLE_ALUMINUM_WIRE, new SealableAluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(TIN_DECORATION.block()))); + public static final Block HEAVY_SEALABLE_ALUMINUM_WIRE = BLOCKS.registerWithItem(Constant.Block.HEAVY_SEALABLE_ALUMINUM_WIRE, new HeavySealableAluminumWireBlock(BlockBehaviour.Properties.ofFullCopy(TIN_DECORATION.block()))); + public static final Block GLASS_FLUID_PIPE = BLOCKS.registerWithItem(Constant.Block.GLASS_FLUID_PIPE, new GlassFluidPipeBlock(BlockBehaviour.Properties.of().instrument(NoteBlockInstrument.HAT).sound(SoundType.GLASS).requiresCorrectToolForDrops())); + public static final Block FUELING_PAD = BLOCKS.registerWithItem(Constant.Block.FUELING_PAD, new FuelPadBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 10.0F).requiresCorrectToolForDrops())); + public static final Block ROCKET_LAUNCH_PAD = BLOCKS.registerWithItem(Constant.Block.ROCKET_LAUNCH_PAD, new LaunchPadBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 10.0F).requiresCorrectToolForDrops())); + public static final Block ROCKET_WORKBENCH = BLOCKS.registerWithItem(Constant.Block.ROCKET_WORKBENCH, new RocketWorkbench(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GRAY).instrument(NoteBlockInstrument.BASEDRUM).strength(1.5F, 6.0F))); public static final Block PARACHEST = BLOCKS.registerWithItem(Constant.Block.PARACHEST, new ParachestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST))); // LIGHT PANELS - public static final Block SQUARE_LIGHT_PANEL = BLOCKS.register(Constant.Block.SQUARE_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL))); - public static final Block SPOTLIGHT_LIGHT_PANEL = BLOCKS.register(Constant.Block.SPOTLIGHT_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 3.0f)); - public static final Block LINEAR_LIGHT_PANEL = BLOCKS.register(Constant.Block.LINEAR_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 5.0f)); - public static final Block DASHED_LIGHT_PANEL = BLOCKS.register(Constant.Block.DASHED_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 1.0f)); - public static final Block DIAGONAL_LIGHT_PANEL = BLOCKS.register(Constant.Block.DIAGONAL_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 1.0f)); + public static final Block SQUARE_LIGHT_PANEL = BLOCKS.registerWithItem(Constant.Block.SQUARE_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL))); + public static final Block SPOTLIGHT_LIGHT_PANEL = BLOCKS.registerWithItem(Constant.Block.SPOTLIGHT_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 3.0f)); + public static final Block LINEAR_LIGHT_PANEL = BLOCKS.registerWithItem(Constant.Block.LINEAR_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 5.0f)); + public static final Block DASHED_LIGHT_PANEL = BLOCKS.registerWithItem(Constant.Block.DASHED_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 1.0f)); + public static final Block DIAGONAL_LIGHT_PANEL = BLOCKS.registerWithItem(Constant.Block.DIAGONAL_LIGHT_PANEL, new LightPanelBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL), 1.0f)); // VACUUM GLASS - public static final Block VACUUM_GLASS = BLOCKS.register(Constant.Block.VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); - public static final Block CLEAR_VACUUM_GLASS = BLOCKS.register(Constant.Block.CLEAR_VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); - public static final Block STRONG_VACUUM_GLASS = BLOCKS.register(Constant.Block.STRONG_VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); + public static final Block VACUUM_GLASS = BLOCKS.registerWithItem(Constant.Block.VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); + public static final Block CLEAR_VACUUM_GLASS = BLOCKS.registerWithItem(Constant.Block.CLEAR_VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); + public static final Block STRONG_VACUUM_GLASS = BLOCKS.registerWithItem(Constant.Block.STRONG_VACUUM_GLASS, new VacuumGlassBlock(BlockBehaviour.Properties.of().noOcclusion().sound(SoundType.GLASS))); // ORES - public static final Block SILICON_ORE = BLOCKS.register(Constant.Block.SILICON_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); - public static final Block DEEPSLATE_SILICON_ORE = BLOCKS.register(Constant.Block.DEEPSLATE_SILICON_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(4.5F, 3.0F, true))); + public static final Block SILICON_ORE = BLOCKS.registerWithItem(Constant.Block.SILICON_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); + public static final Block DEEPSLATE_SILICON_ORE = BLOCKS.registerWithItem(Constant.Block.DEEPSLATE_SILICON_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(4.5F, 3.0F, true))); - public static final Block MOON_COPPER_ORE = BLOCKS.register(Constant.Block.MOON_COPPER_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); - public static final Block LUNASLATE_COPPER_ORE = BLOCKS.register(Constant.Block.LUNASLATE_COPPER_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(5.0F, 5.0F, true))); + public static final Block MOON_COPPER_ORE = BLOCKS.registerWithItem(Constant.Block.MOON_COPPER_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); + public static final Block LUNASLATE_COPPER_ORE = BLOCKS.registerWithItem(Constant.Block.LUNASLATE_COPPER_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(5.0F, 5.0F, true))); - public static final Block TIN_ORE = BLOCKS.register(Constant.Block.TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); - public static final Block DEEPSLATE_TIN_ORE = BLOCKS.register(Constant.Block.DEEPSLATE_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(4.5F, 3.0F, true))); - public static final Block MOON_TIN_ORE = BLOCKS.register(Constant.Block.MOON_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); - public static final Block LUNASLATE_TIN_ORE = BLOCKS.register(Constant.Block.LUNASLATE_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(5.0F, 5.0F, true))); + public static final Block TIN_ORE = BLOCKS.registerWithItem(Constant.Block.TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); + public static final Block DEEPSLATE_TIN_ORE = BLOCKS.registerWithItem(Constant.Block.DEEPSLATE_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(4.5F, 3.0F, true))); + public static final Block MOON_TIN_ORE = BLOCKS.registerWithItem(Constant.Block.MOON_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); + public static final Block LUNASLATE_TIN_ORE = BLOCKS.registerWithItem(Constant.Block.LUNASLATE_TIN_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(5.0F, 5.0F, true))); - public static final Block ALUMINUM_ORE = BLOCKS.register(Constant.Block.ALUMINUM_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); - public static final Block DEEPSLATE_ALUMINUM_ORE = BLOCKS.register(Constant.Block.DEEPSLATE_ALUMINUM_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.5F, 3.0F, true))); + public static final Block ALUMINUM_ORE = BLOCKS.registerWithItem(Constant.Block.ALUMINUM_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 3.0F, false))); + public static final Block DEEPSLATE_ALUMINUM_ORE = BLOCKS.registerWithItem(Constant.Block.DEEPSLATE_ALUMINUM_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.5F, 3.0F, true))); - public static final Block DESH_ORE = BLOCKS.register(Constant.Block.DESH_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); + public static final Block DESH_ORE = BLOCKS.registerWithItem(Constant.Block.DESH_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); - public static final Block ILMENITE_ORE = BLOCKS.register(Constant.Block.ILMENITE_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); + public static final Block ILMENITE_ORE = BLOCKS.registerWithItem(Constant.Block.ILMENITE_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); - public static final Block GALENA_ORE = BLOCKS.register(Constant.Block.GALENA_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); + public static final Block GALENA_ORE = BLOCKS.registerWithItem(Constant.Block.GALENA_ORE, new DropExperienceBlock(ConstantInt.of(0), oreSettings(3.0F, 5.0F, false))); public static final Block OLIVINE_CLUSTER = BLOCKS.registerWithItem(Constant.Block.OLIVINE_CLUSTER, new OlivineClusterBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_CLUSTER).mapColor(MapColor.COLOR_LIGHT_GREEN))); public static final Block OLIVINE_BASALT = BLOCKS.registerWithItem(Constant.Block.OLIVINE_BASALT, new Block(BlockBehaviour.Properties.ofFullCopy(MOON_BASALT).strength(3.5F, 6.0F))); public static final Block RICH_OLIVINE_BASALT = BLOCKS.registerWithItem(Constant.Block.RICH_OLIVINE_BASALT, new Block(BlockBehaviour.Properties.ofFullCopy(OLIVINE_BASALT))); // CHEESE BLOCKS - public static final Block MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.MOON_CHEESE_WHEEL, new MoonCheeseWheel(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY))); + public static final Block MOON_CHEESE_WHEEL = BLOCKS.registerWithItem(Constant.Block.MOON_CHEESE_WHEEL, new MoonCheeseWheel(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY))); public static final Block CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.CANDLE, BlockBehaviour.Properties.ofFullCopy(MOON_CHEESE_WHEEL).lightLevel(litBlockEmission(3)))); public static final Block WHITE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.WHITE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.WHITE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); public static final Block ORANGE_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.ORANGE_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.ORANGE_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); @@ -266,14 +264,14 @@ public class GCBlocks { public static final Block BLACK_CANDLE_MOON_CHEESE_WHEEL = BLOCKS.register(Constant.Block.BLACK_CANDLE_MOON_CHEESE_WHEEL, new CandleMoonCheeseWheel(Blocks.BLACK_CANDLE, BlockBehaviour.Properties.ofFullCopy(CANDLE_MOON_CHEESE_WHEEL))); // COMPACT MINERAL BLOCKS - public static final Block SILICON_BLOCK = BLOCKS.register(Constant.Block.SILICON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block METEORIC_IRON_BLOCK = BLOCKS.register(Constant.Block.METEORIC_IRON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block DESH_BLOCK = BLOCKS.register(Constant.Block.DESH_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block SILICON_BLOCK = BLOCKS.registerWithItem(Constant.Block.SILICON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block METEORIC_IRON_BLOCK = BLOCKS.registerWithItem(Constant.Block.METEORIC_IRON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block DESH_BLOCK = BLOCKS.registerWithItem(Constant.Block.DESH_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final Block ALUMINUM_BLOCK = BLOCKS.registerWithItem(Constant.Block.ALUMINUM_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); public static final Block TIN_BLOCK = BLOCKS.registerWithItem(Constant.Block.TIN_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block TITANIUM_BLOCK = BLOCKS.register(Constant.Block.TITANIUM_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block LEAD_BLOCK = BLOCKS.register(Constant.Block.LEAD_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block LUNAR_SAPPHIRE_BLOCK = BLOCKS.register(Constant.Block.LUNAR_SAPPHIRE_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(5.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); + public static final Block TITANIUM_BLOCK = BLOCKS.registerWithItem(Constant.Block.TITANIUM_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block LEAD_BLOCK = BLOCKS.registerWithItem(Constant.Block.LEAD_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block LUNAR_SAPPHIRE_BLOCK = BLOCKS.registerWithItem(Constant.Block.LUNAR_SAPPHIRE_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(5.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); public static final Block OLIVINE_BLOCK = BLOCKS.registerWithItem(Constant.Block.OLIVINE_BLOCK, new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_LIGHT_GREEN).strength(1.5F, 1.5F).sound(SoundType.AMETHYST).requiresCorrectToolForDrops())); public static final Block RAW_METEORIC_IRON_BLOCK = BLOCKS.registerWithItem(Constant.Block.RAW_METEORIC_IRON_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); public static final Block RAW_DESH_BLOCK = BLOCKS.registerWithItem(Constant.Block.RAW_DESH_BLOCK, new Block(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(5.0F, 6.0F).sound(SoundType.STONE).requiresCorrectToolForDrops())); @@ -285,48 +283,44 @@ public class GCBlocks { // MOON VILLAGER SPECIAL - public static final Block LUNAR_CARTOGRAPHY_TABLE = BLOCKS.register(Constant.Block.LUNAR_CARTOGRAPHY_TABLE, new LunarCartographyTableBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.5F).sound(SoundType.WOOD))); + public static final Block LUNAR_CARTOGRAPHY_TABLE = BLOCKS.registerWithItem(Constant.Block.LUNAR_CARTOGRAPHY_TABLE, new LunarCartographyTableBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WOOD).ignitedByLava().instrument(NoteBlockInstrument.BASS).strength(2.5F).sound(SoundType.WOOD))); // MISC WORLD GEN - public static final Block CAVERNOUS_VINES = register(Constant.Block.CAVERNOUS_VINES, new CavernousVinesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).randomTicks().noCollission().lightLevel(CavernousVines.emission(8)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY))); - public static final Block CAVERNOUS_VINES_PLANT = BLOCKS.register(Constant.Block.CAVERNOUS_VINES_PLANT, new CavernousVinesPlantBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).noCollission().lightLevel(CavernousVines.emission(8)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY).dropsLike(CAVERNOUS_VINES))); - public static final Block BOSS_SPAWNER = BLOCKS.register(Constant.Block.BOSS_SPAWNER, new BossSpawner(BlockBehaviour.Properties.ofFullCopy(Blocks.SPAWNER).noLootTable().noCollission())); + public static final Block CAVERNOUS_VINES = BLOCKS.registerWithItem(Constant.Block.CAVERNOUS_VINES, new CavernousVinesBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).randomTicks().noCollission().lightLevel(CavernousVines.emission(8)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY))); + public static final Block CAVERNOUS_VINES_PLANT = BLOCKS.registerWithItem(Constant.Block.CAVERNOUS_VINES_PLANT, new CavernousVinesPlantBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_GREEN).noCollission().lightLevel(CavernousVines.emission(8)).instabreak().sound(SoundType.CAVE_VINES).pushReaction(PushReaction.DESTROY).dropsLike(CAVERNOUS_VINES))); + public static final Block BOSS_SPAWNER = BLOCKS.registerWithItem(Constant.Block.BOSS_SPAWNER, new BossSpawner(BlockBehaviour.Properties.ofFullCopy(Blocks.SPAWNER).noLootTable().noCollission())); // MUTLIBLOCK PARTS public static final BaseEntityBlock SOLAR_PANEL_PART = BLOCKS.register(Constant.Block.SOLAR_PANEL_PART, new SolarPanelPartBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(-1.0F, 5.0F).noLootTable().sound(SoundType.METAL))); public static final BaseEntityBlock CRYOGENIC_CHAMBER_PART = BLOCKS.register(Constant.Block.CRYOGENIC_CHAMBER_PART, new CryogenicChamberPart(BlockBehaviour.Properties.of().noOcclusion().isSuffocating(GCBlocks::never).isViewBlocking(GCBlocks::never).mapColor(MapColor.METAL).strength(3.0F, 5.0F).noLootTable().sound(SoundType.METAL).requiresCorrectToolForDrops())); // MISC MACHINES - public static final Block CRYOGENIC_CHAMBER = BLOCKS.register(Constant.Block.CRYOGENIC_CHAMBER, new CryogenicChamberBlock(BlockBehaviour.Properties.of().noOcclusion().isSuffocating(GCBlocks::never).isViewBlocking(GCBlocks::never).mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block PLAYER_TRANSPORT_TUBE = BLOCKS.register(Constant.Block.PLAYER_TRANSPORT_TUBE, new TransportTube(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).noCollission())); + public static final Block CRYOGENIC_CHAMBER = BLOCKS.registerWithItem(Constant.Block.CRYOGENIC_CHAMBER, new CryogenicChamberBlock(BlockBehaviour.Properties.of().noOcclusion().isSuffocating(GCBlocks::never).isViewBlocking(GCBlocks::never).mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block PLAYER_TRANSPORT_TUBE = BLOCKS.registerWithItem(Constant.Block.PLAYER_TRANSPORT_TUBE, new TransportTube(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).noCollission())); // MACHINES - public static final Block CIRCUIT_FABRICATOR = BLOCKS.register(Constant.Block.CIRCUIT_FABRICATOR, new ElectricGrillBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.CIRCUIT_FABRICATOR))); - public static final Block COMPRESSOR = BLOCKS.register(Constant.Block.COMPRESSOR, new CompressorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops().lightLevel(state -> state.getValue(CompressorBlock.ACTIVE) ? 13 : 0))); - public static final Block ELECTRIC_COMPRESSOR = BLOCKS.register(Constant.Block.ELECTRIC_COMPRESSOR, new ElectricGrillBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_COMPRESSOR))); - public static final Block COAL_GENERATOR = BLOCKS.register(Constant.Block.COAL_GENERATOR, new CoalGeneratorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops().lightLevel(state -> state.getValue(CoalGeneratorBlock.ACTIVE) ? 13 : 0))); - public static final Block BASIC_SOLAR_PANEL = BLOCKS.register(Constant.Block.BASIC_SOLAR_PANEL, SimpleMultiBlockMachineBlock.create(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.BASIC_SOLAR_PANEL), MultiBlockUtil.generateSolarPanelParts(), GCBlocks.SOLAR_PANEL_PART)); - public static final Block ADVANCED_SOLAR_PANEL = BLOCKS.register(Constant.Block.ADVANCED_SOLAR_PANEL, SimpleMultiBlockMachineBlock.create(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ADVANCED_SOLAR_PANEL), MultiBlockUtil.generateSolarPanelParts(), GCBlocks.SOLAR_PANEL_PART)); - public static final Block ENERGY_STORAGE_MODULE = BLOCKS.register(Constant.Block.ENERGY_STORAGE_MODULE, new ResourceStorageBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ENERGY_STORAGE_MODULE))); - public static final Block ELECTRIC_FURNACE = BLOCKS.register(Constant.Block.ELECTRIC_FURNACE, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_FURNACE))); - public static final Block ELECTRIC_ARC_FURNACE = BLOCKS.register(Constant.Block.ELECTRIC_ARC_FURNACE, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_ARC_FURNACE))); - public static final Block REFINERY = BLOCKS.register(Constant.Block.REFINERY, new RefineryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block OXYGEN_COLLECTOR = BLOCKS.register(Constant.Block.OXYGEN_COLLECTOR, new OxygenCollectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - public static final Block OXYGEN_SEALER = BLOCKS.register(Constant.Block.OXYGEN_SEALER, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_SEALER))); - public static final Block OXYGEN_BUBBLE_DISTRIBUTOR = BLOCKS.register(Constant.Block.OXYGEN_BUBBLE_DISTRIBUTOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_BUBBLE_DISTRIBUTOR))); - public static final Block OXYGEN_DECOMPRESSOR = BLOCKS.register(Constant.Block.OXYGEN_DECOMPRESSOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_DECOMPRESSOR))); - public static final Block OXYGEN_COMPRESSOR = BLOCKS.register(Constant.Block.OXYGEN_COMPRESSOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_COMPRESSOR))); - public static final Block OXYGEN_STORAGE_MODULE = BLOCKS.register(Constant.Block.OXYGEN_STORAGE_MODULE, new ResourceStorageBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_STORAGE_MODULE))); - public static final Block FUEL_LOADER = BLOCKS.register(Constant.Block.FUEL_LOADER, new FuelLoaderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); - - public static final AirlockBlock AIR_LOCK_FRAME = BLOCKS.register(Constant.Block.AIR_LOCK_FRAME, new AirlockBlock(false, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK))); - public static final AirlockBlock AIR_LOCK_CONTROLLER = BLOCKS.register(Constant.Block.AIR_LOCK_CONTROLLER, new AirlockBlock(true, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK))); + public static final Block CIRCUIT_FABRICATOR = BLOCKS.registerWithItem(Constant.Block.CIRCUIT_FABRICATOR, new ElectricGrillBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.CIRCUIT_FABRICATOR))); + public static final Block COMPRESSOR = BLOCKS.registerWithItem(Constant.Block.COMPRESSOR, new CompressorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops().lightLevel(state -> state.getValue(CompressorBlock.ACTIVE) ? 13 : 0))); + public static final Block ELECTRIC_COMPRESSOR = BLOCKS.registerWithItem(Constant.Block.ELECTRIC_COMPRESSOR, new ElectricGrillBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_COMPRESSOR))); + public static final Block COAL_GENERATOR = BLOCKS.registerWithItem(Constant.Block.COAL_GENERATOR, new CoalGeneratorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops().lightLevel(state -> state.getValue(CoalGeneratorBlock.ACTIVE) ? 13 : 0))); + public static final Block BASIC_SOLAR_PANEL = BLOCKS.registerWithItem(Constant.Block.BASIC_SOLAR_PANEL, SimpleMultiBlockMachineBlock.create(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.BASIC_SOLAR_PANEL), MultiBlockUtil.generateSolarPanelParts(), GCBlocks.SOLAR_PANEL_PART)); + public static final Block ADVANCED_SOLAR_PANEL = BLOCKS.registerWithItem(Constant.Block.ADVANCED_SOLAR_PANEL, SimpleMultiBlockMachineBlock.create(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ADVANCED_SOLAR_PANEL), MultiBlockUtil.generateSolarPanelParts(), GCBlocks.SOLAR_PANEL_PART)); + public static final Block ENERGY_STORAGE_MODULE = BLOCKS.registerWithItem(Constant.Block.ENERGY_STORAGE_MODULE, new ResourceStorageBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ENERGY_STORAGE_MODULE))); + public static final Block ELECTRIC_FURNACE = BLOCKS.registerWithItem(Constant.Block.ELECTRIC_FURNACE, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_FURNACE))); + public static final Block ELECTRIC_ARC_FURNACE = BLOCKS.registerWithItem(Constant.Block.ELECTRIC_ARC_FURNACE, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.ELECTRIC_ARC_FURNACE))); + public static final Block REFINERY = BLOCKS.registerWithItem(Constant.Block.REFINERY, new RefineryBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block OXYGEN_COLLECTOR = BLOCKS.registerWithItem(Constant.Block.OXYGEN_COLLECTOR, new OxygenCollectorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + public static final Block OXYGEN_SEALER = BLOCKS.registerWithItem(Constant.Block.OXYGEN_SEALER, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_SEALER))); + public static final Block OXYGEN_BUBBLE_DISTRIBUTOR = BLOCKS.registerWithItem(Constant.Block.OXYGEN_BUBBLE_DISTRIBUTOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_BUBBLE_DISTRIBUTOR))); + public static final Block OXYGEN_DECOMPRESSOR = BLOCKS.registerWithItem(Constant.Block.OXYGEN_DECOMPRESSOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_DECOMPRESSOR))); + public static final Block OXYGEN_COMPRESSOR = BLOCKS.registerWithItem(Constant.Block.OXYGEN_COMPRESSOR, new SimpleMachineBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_COMPRESSOR))); + public static final Block OXYGEN_STORAGE_MODULE = BLOCKS.registerWithItem(Constant.Block.OXYGEN_STORAGE_MODULE, new ResourceStorageBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops(), Constant.id(Constant.Block.OXYGEN_STORAGE_MODULE))); + public static final Block FUEL_LOADER = BLOCKS.registerWithItem(Constant.Block.FUEL_LOADER, new FuelLoaderBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).strength(3.0F, 5.0F).sound(SoundType.METAL).requiresCorrectToolForDrops())); + + public static final AirlockBlock AIR_LOCK_FRAME = BLOCKS.registerWithItem(Constant.Block.AIR_LOCK_FRAME, new AirlockBlock(false, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK))); + public static final AirlockBlock AIR_LOCK_CONTROLLER = BLOCKS.registerWithItem(Constant.Block.AIR_LOCK_CONTROLLER, new AirlockBlock(true, BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK))); public static final Block AIR_LOCK_SEAL = BLOCKS.register(Constant.Block.AIR_LOCK_SEAL, new Block(BlockBehaviour.Properties.ofFullCopy(AIR_LOCK_FRAME))); - public static Block register(String id, Block block) { - return Registry.register(BuiltInRegistries.BLOCK, Constant.id(id), block); - } - public static void register() { FlammableBlockRegistry.getDefaultInstance().add(FUEL, 80, 130); FlammableBlockRegistry.getDefaultInstance().add(CRUDE_OIL, 60, 100); diff --git a/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesBlock.java b/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesBlock.java index 32bc45fc9..1eccf0ff6 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesBlock.java +++ b/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesBlock.java @@ -24,7 +24,6 @@ import com.mojang.serialization.MapCodec; import dev.galacticraft.mod.content.GCBlocks; -import dev.galacticraft.mod.content.item.GCItems; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -113,7 +112,7 @@ protected BlockState getGrowIntoState(BlockState blockState, RandomSource random @Override public ItemStack getCloneItemStack(LevelReader blockGetter, BlockPos blockPos, BlockState blockState) { - return new ItemStack(GCItems.CAVERNOUS_VINES); + return new ItemStack(GCBlocks.CAVERNOUS_VINES); } @Override diff --git a/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesPlantBlock.java b/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesPlantBlock.java index 6c1cd8429..7e3f6054e 100644 --- a/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesPlantBlock.java +++ b/src/main/java/dev/galacticraft/mod/content/block/environment/CavernousVinesPlantBlock.java @@ -24,13 +24,11 @@ import com.mojang.serialization.MapCodec; import dev.galacticraft.mod.content.GCBlocks; -import dev.galacticraft.mod.content.item.GCItems; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; @@ -63,10 +61,10 @@ protected BlockState updateHeadAfterConvertedFromBody(BlockState blockState, Blo return blockState2.setValue(POISONOUS, blockState.getValue(POISONOUS)).setValue(WATERLOGGED, blockState.getValue(WATERLOGGED)); } - @Override - public ItemStack getCloneItemStack(LevelReader levelReader, BlockPos blockPos, BlockState blockState) { - return new ItemStack(GCItems.CAVERNOUS_VINES); - } +// @Override +// public ItemStack getCloneItemStack(LevelReader levelReader, BlockPos blockPos, BlockState blockState) { +// return new ItemStack(GCBlocks.CAVERNOUS_VINES_PLANT); +// } @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java index 6d1774731..08de68cc6 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCCreativeModeTabs.java @@ -27,7 +27,6 @@ import dev.galacticraft.api.rocket.RocketPrefabs; import dev.galacticraft.mod.Constant; import dev.galacticraft.mod.content.GCBlockRegistry; -import dev.galacticraft.mod.content.GCBlocks; import dev.galacticraft.mod.storage.PlaceholderItemStorage; import dev.galacticraft.mod.util.Translations; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; @@ -45,6 +44,7 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; +import static dev.galacticraft.mod.content.GCBlocks.*; import static dev.galacticraft.mod.content.item.GCItems.*; public class GCCreativeModeTabs { @@ -274,11 +274,11 @@ public class GCCreativeModeTabs { public static final CreativeModeTab BLOCKS_GROUP = FabricItemGroup .builder() - .icon(() -> new ItemStack(GCItems.MOON_TURF)) + .icon(() -> new ItemStack(MOON_TURF)) .title(Component.translatable(Translations.ItemGroup.BLOCKS)) .displayItems((parameters, output) -> { // DECORATION BLOCKS - for (GCBlockRegistry.DecorationSet decorationSet : GCBlocks.BLOCKS.getDecorations()) { + for (GCBlockRegistry.DecorationSet decorationSet : BLOCKS.getDecorations()) { output.accept(decorationSet.item()); output.accept(decorationSet.slabItem()); output.accept(decorationSet.stairsItem()); @@ -290,8 +290,8 @@ public class GCCreativeModeTabs { } // TORCHES - output.accept(GLOWSTONE_TORCH); - output.accept(UNLIT_TORCH); + output.accept(GCItems.GLOWSTONE_TORCH); + output.accept(GCItems.UNLIT_TORCH); // LANTERNS output.accept(GLOWSTONE_LANTERN); @@ -302,7 +302,7 @@ public class GCCreativeModeTabs { output.accept(MOON_DIRT); output.accept(MOON_DIRT_PATH); output.accept(MOON_SURFACE_ROCK); - output.accept(GCBlocks.MOON_DUNGEON_BRICK); + output.accept(MOON_DUNGEON_BRICK); output.accept(MOON_ROCK); output.accept(MOON_ROCK_SLAB); @@ -395,7 +395,7 @@ public class GCCreativeModeTabs { output.accept(ROCKET_LAUNCH_PAD); for (DyeColor color : DyeColor.values()) { - ItemStack stack = new ItemStack(GCBlocks.PARACHEST); + ItemStack stack = new ItemStack(PARACHEST); stack.set(DataComponents.BASE_COLOR, color); output.accept(stack); } @@ -433,27 +433,27 @@ public class GCCreativeModeTabs { output.accept(GALENA_ORE); - output.accept(GCBlocks.OLIVINE_BASALT); - output.accept(GCBlocks.RICH_OLIVINE_BASALT); - output.accept(GCBlocks.OLIVINE_CLUSTER); + output.accept(OLIVINE_BASALT); + output.accept(RICH_OLIVINE_BASALT); + output.accept(OLIVINE_CLUSTER); // COMPACT MINERAL BLOCKS output.accept(MOON_CHEESE_WHEEL); output.accept(SILICON_BLOCK); - output.accept(GCBlocks.ALUMINUM_BLOCK); + output.accept(ALUMINUM_BLOCK); output.accept(METEORIC_IRON_BLOCK); output.accept(DESH_BLOCK); - output.accept(GCBlocks.TIN_BLOCK); + output.accept(TIN_BLOCK); output.accept(TITANIUM_BLOCK); output.accept(LEAD_BLOCK); output.accept(LUNAR_SAPPHIRE_BLOCK); - output.accept(GCBlocks.RAW_ALUMINUM_BLOCK); - output.accept(GCBlocks.RAW_METEORIC_IRON_BLOCK); - output.accept(GCBlocks.RAW_DESH_BLOCK); - output.accept(GCBlocks.RAW_TIN_BLOCK); - output.accept(GCBlocks.RAW_TITANIUM_BLOCK); - output.accept(GCBlocks.RAW_LEAD_BLOCK); - output.accept(GCBlocks.OLIVINE_BLOCK); + output.accept(RAW_ALUMINUM_BLOCK); + output.accept(RAW_METEORIC_IRON_BLOCK); + output.accept(RAW_DESH_BLOCK); + output.accept(RAW_TIN_BLOCK); + output.accept(RAW_TITANIUM_BLOCK); + output.accept(RAW_LEAD_BLOCK); + output.accept(OLIVINE_BLOCK); // MOON VILLAGER SPECIAL output.accept(LUNAR_CARTOGRAPHY_TABLE); @@ -470,7 +470,7 @@ public class GCCreativeModeTabs { public static final CreativeModeTab MACHINES_GROUP = FabricItemGroup .builder() - .icon(() -> new ItemStack(GCItems.COAL_GENERATOR)) + .icon(() -> new ItemStack(COAL_GENERATOR)) .title(Component.translatable(Translations.ItemGroup.MACHINES)) .displayItems((parameters, output) -> { output.accept(CIRCUIT_FABRICATOR); diff --git a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java index f8221157e..9b911fdfb 100644 --- a/src/main/java/dev/galacticraft/mod/content/item/GCItems.java +++ b/src/main/java/dev/galacticraft/mod/content/item/GCItems.java @@ -31,9 +31,7 @@ import dev.galacticraft.mod.content.GCRegistry; import dev.galacticraft.mod.content.GCRocketParts; import dev.galacticraft.mod.util.Translations; -import net.fabricmc.fabric.api.item.v1.FabricItem; import net.minecraft.core.Direction; -import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -49,262 +47,78 @@ public class GCItems { public static final GCRegistry ITEMS = new GCRegistry<>(BuiltInRegistries.ITEM); public static final List HIDDEN_ITEMS = new ArrayList<>(1); - // === START BLOCKS === // TORCHES public static final Item GLOWSTONE_TORCH = ITEMS.register(Constant.Block.GLOWSTONE_TORCH, new StandingAndWallBlockItem(GCBlocks.GLOWSTONE_TORCH, GCBlocks.GLOWSTONE_WALL_TORCH, new Item.Properties(), Direction.DOWN)); public static final Item UNLIT_TORCH = ITEMS.register(Constant.Block.UNLIT_TORCH, new StandingAndWallBlockItem(GCBlocks.UNLIT_TORCH, GCBlocks.UNLIT_WALL_TORCH, new Item.Properties(), Direction.DOWN)); - - // LANTERNS - public static final Item GLOWSTONE_LANTERN = ITEMS.register(Constant.Block.GLOWSTONE_LANTERN, new BlockItem(GCBlocks.GLOWSTONE_LANTERN, new Item.Properties())); - public static final Item UNLIT_LANTERN = ITEMS.register(Constant.Block.UNLIT_LANTERN, new BlockItem(GCBlocks.UNLIT_LANTERN, new Item.Properties())); - - // MOON NATURAL - public static final Item MOON_TURF = new BlockItem(GCBlocks.MOON_TURF, new Item.Properties()); - public static final Item MOON_DIRT = new BlockItem(GCBlocks.MOON_DIRT, new Item.Properties()); - public static final Item MOON_DIRT_PATH = new BlockItem(GCBlocks.MOON_DIRT_PATH, new Item.Properties()); - public static final Item MOON_SURFACE_ROCK = new BlockItem(GCBlocks.MOON_SURFACE_ROCK, new Item.Properties()); - - public static final Item MOON_ROCK = new BlockItem(GCBlocks.MOON_ROCK, new Item.Properties()); - public static final Item MOON_ROCK_SLAB = new BlockItem(GCBlocks.MOON_ROCK_SLAB, new Item.Properties()); - public static final Item MOON_ROCK_STAIRS = new BlockItem(GCBlocks.MOON_ROCK_STAIRS, new Item.Properties()); - public static final Item MOON_ROCK_WALL = new BlockItem(GCBlocks.MOON_ROCK_WALL, new Item.Properties()); - - public static final Item MOON_ROCK_BRICK = new BlockItem(GCBlocks.MOON_ROCK_BRICK, new Item.Properties()); - public static final Item MOON_ROCK_BRICK_SLAB = new BlockItem(GCBlocks.MOON_ROCK_BRICK_SLAB, new Item.Properties()); - public static final Item MOON_ROCK_BRICK_STAIRS = new BlockItem(GCBlocks.MOON_ROCK_BRICK_STAIRS, new Item.Properties()); - public static final Item MOON_ROCK_BRICK_WALL = new BlockItem(GCBlocks.MOON_ROCK_BRICK_WALL, new Item.Properties()); - - public static final Item CRACKED_MOON_ROCK_BRICK = new BlockItem(GCBlocks.CRACKED_MOON_ROCK_BRICK, new Item.Properties()); - public static final Item CRACKED_MOON_ROCK_BRICK_SLAB = new BlockItem(GCBlocks.CRACKED_MOON_ROCK_BRICK_SLAB, new Item.Properties()); - public static final Item CRACKED_MOON_ROCK_BRICK_STAIRS = new BlockItem(GCBlocks.CRACKED_MOON_ROCK_BRICK_STAIRS, new Item.Properties()); - public static final Item CRACKED_MOON_ROCK_BRICK_WALL = new BlockItem(GCBlocks.CRACKED_MOON_ROCK_BRICK_WALL, new Item.Properties()); - - public static final Item POLISHED_MOON_ROCK = new BlockItem(GCBlocks.POLISHED_MOON_ROCK, new Item.Properties()); - public static final Item POLISHED_MOON_ROCK_SLAB = new BlockItem(GCBlocks.POLISHED_MOON_ROCK_SLAB, new Item.Properties()); - public static final Item POLISHED_MOON_ROCK_STAIRS = new BlockItem(GCBlocks.POLISHED_MOON_ROCK_STAIRS, new Item.Properties()); - public static final Item POLISHED_MOON_ROCK_WALL = new BlockItem(GCBlocks.POLISHED_MOON_ROCK_WALL, new Item.Properties()); - - public static final Item CHISELED_MOON_ROCK_BRICK = new BlockItem(GCBlocks.CHISELED_MOON_ROCK_BRICK, new Item.Properties()); - public static final Item MOON_ROCK_PILLAR = new BlockItem(GCBlocks.MOON_ROCK_PILLAR, new Item.Properties()); - - public static final Item COBBLED_MOON_ROCK = new BlockItem(GCBlocks.COBBLED_MOON_ROCK, new Item.Properties()); - public static final Item COBBLED_MOON_ROCK_SLAB = new BlockItem(GCBlocks.COBBLED_MOON_ROCK_SLAB, new Item.Properties()); - public static final Item COBBLED_MOON_ROCK_STAIRS = new BlockItem(GCBlocks.COBBLED_MOON_ROCK_STAIRS, new Item.Properties()); - public static final Item COBBLED_MOON_ROCK_WALL = new BlockItem(GCBlocks.COBBLED_MOON_ROCK_WALL, new Item.Properties()); - - public static final Item LUNASLATE = new BlockItem(GCBlocks.LUNASLATE, new Item.Properties()); - public static final Item LUNASLATE_SLAB = new BlockItem(GCBlocks.LUNASLATE_SLAB, new Item.Properties()); - public static final Item LUNASLATE_STAIRS = new BlockItem(GCBlocks.LUNASLATE_STAIRS, new Item.Properties()); - public static final Item LUNASLATE_WALL = new BlockItem(GCBlocks.LUNASLATE_WALL, new Item.Properties()); - - public static final Item COBBLED_LUNASLATE = new BlockItem(GCBlocks.COBBLED_LUNASLATE, new Item.Properties()); - public static final Item COBBLED_LUNASLATE_SLAB = new BlockItem(GCBlocks.COBBLED_LUNASLATE_SLAB, new Item.Properties()); - public static final Item COBBLED_LUNASLATE_STAIRS = new BlockItem(GCBlocks.COBBLED_LUNASLATE_STAIRS, new Item.Properties()); - public static final Item COBBLED_LUNASLATE_WALL = new BlockItem(GCBlocks.COBBLED_LUNASLATE_WALL, new Item.Properties()); - - public static final Item MOON_BASALT = new BlockItem(GCBlocks.MOON_BASALT, new Item.Properties()); - public static final Item MOON_BASALT_SLAB = new BlockItem(GCBlocks.MOON_BASALT_SLAB, new Item.Properties()); - public static final Item MOON_BASALT_STAIRS = new BlockItem(GCBlocks.MOON_BASALT_STAIRS, new Item.Properties()); - public static final Item MOON_BASALT_WALL = new BlockItem(GCBlocks.MOON_BASALT_WALL, new Item.Properties()); - - public static final Item MOON_BASALT_BRICK = new BlockItem(GCBlocks.MOON_BASALT_BRICK, new Item.Properties()); - public static final Item MOON_BASALT_BRICK_SLAB = new BlockItem(GCBlocks.MOON_BASALT_BRICK_SLAB, new Item.Properties()); - public static final Item MOON_BASALT_BRICK_STAIRS = new BlockItem(GCBlocks.MOON_BASALT_BRICK_STAIRS, new Item.Properties()); - public static final Item MOON_BASALT_BRICK_WALL = new BlockItem(GCBlocks.MOON_BASALT_BRICK_WALL, new Item.Properties()); - - public static final Item CRACKED_MOON_BASALT_BRICK = new BlockItem(GCBlocks.CRACKED_MOON_BASALT_BRICK, new Item.Properties()); - public static final Item CRACKED_MOON_BASALT_BRICK_SLAB = new BlockItem(GCBlocks.CRACKED_MOON_BASALT_BRICK_SLAB, new Item.Properties()); - public static final Item CRACKED_MOON_BASALT_BRICK_STAIRS = new BlockItem(GCBlocks.CRACKED_MOON_BASALT_BRICK_STAIRS, new Item.Properties()); - public static final Item CRACKED_MOON_BASALT_BRICK_WALL = new BlockItem(GCBlocks.CRACKED_MOON_BASALT_BRICK_WALL, new Item.Properties()); - - public static final Item FALLEN_METEOR = new BlockItem(GCBlocks.FALLEN_METEOR, new Item.Properties()); - - // MARS NATURAL - public static final Item MARS_SURFACE_ROCK = new BlockItem(GCBlocks.MARS_SURFACE_ROCK, new Item.Properties()); - public static final Item MARS_SUB_SURFACE_ROCK = new BlockItem(GCBlocks.MARS_SUB_SURFACE_ROCK, new Item.Properties()); - public static final Item MARS_STONE = new BlockItem(GCBlocks.MARS_STONE, new Item.Properties()); - public static final Item MARS_STONE_SLAB = new BlockItem(GCBlocks.MARS_STONE_SLAB, new Item.Properties()); - public static final Item MARS_STONE_STAIRS = new BlockItem(GCBlocks.MARS_STONE_STAIRS, new Item.Properties()); - public static final Item MARS_STONE_WALL = new BlockItem(GCBlocks.MARS_STONE_WALL, new Item.Properties()); - public static final Item MARS_COBBLESTONE = new BlockItem(GCBlocks.MARS_COBBLESTONE, new Item.Properties()); - public static final Item MARS_COBBLESTONE_SLAB = new BlockItem(GCBlocks.MARS_COBBLESTONE_SLAB, new Item.Properties()); - public static final Item MARS_COBBLESTONE_STAIRS = new BlockItem(GCBlocks.MARS_COBBLESTONE_STAIRS, new Item.Properties()); - public static final Item MARS_COBBLESTONE_WALL = new BlockItem(GCBlocks.MARS_COBBLESTONE_WALL, new Item.Properties()); - - // ASTEROID NATURAL - public static final Item ASTEROID_ROCK = new BlockItem(GCBlocks.ASTEROID_ROCK, new Item.Properties()); - public static final Item ASTEROID_ROCK_1 = new BlockItem(GCBlocks.ASTEROID_ROCK_1, new Item.Properties()); - public static final Item ASTEROID_ROCK_2 = new BlockItem(GCBlocks.ASTEROID_ROCK_2, new Item.Properties()); - - // VENUS NATURAL - public static final Item SOFT_VENUS_ROCK = new BlockItem(GCBlocks.SOFT_VENUS_ROCK, new Item.Properties()); - public static final Item HARD_VENUS_ROCK = new BlockItem(GCBlocks.HARD_VENUS_ROCK, new Item.Properties()); - public static final Item SCORCHED_VENUS_ROCK = new BlockItem(GCBlocks.SCORCHED_VENUS_ROCK, new Item.Properties()); - public static final Item VOLCANIC_ROCK = new BlockItem(GCBlocks.VOLCANIC_ROCK, new Item.Properties()); - public static final Item PUMICE = new BlockItem(GCBlocks.PUMICE, new Item.Properties()); - public static final Item VAPOR_SPOUT = new BlockItem(GCBlocks.VAPOR_SPOUT, new Item.Properties()); - - // MISC DECOR - public static final Item WALKWAY = new BlockItem(GCBlocks.WALKWAY, new Item.Properties()); - public static final Item FLUID_PIPE_WALKWAY = new BlockItem(GCBlocks.FLUID_PIPE_WALKWAY, new Item.Properties()); - public static final Item WIRE_WALKWAY = new BlockItem(GCBlocks.WIRE_WALKWAY, new Item.Properties()); - public static final Item TIN_LADDER = new BlockItem(GCBlocks.TIN_LADDER, new Item.Properties()); - public static final Item IRON_GRATING = new BlockItem(GCBlocks.IRON_GRATING, new Item.Properties()); - - // SPECIAL - public static final Item ALUMINUM_WIRE = new BlockItem(GCBlocks.ALUMINUM_WIRE, new Item.Properties()); - public static final Item SEALABLE_ALUMINUM_WIRE = new BlockItem(GCBlocks.SEALABLE_ALUMINUM_WIRE, new Item.Properties()); - public static final Item HEAVY_SEALABLE_ALUMINUM_WIRE = new BlockItem(GCBlocks.HEAVY_SEALABLE_ALUMINUM_WIRE, new Item.Properties()); - public static final Item GLASS_FLUID_PIPE = new BlockItem(GCBlocks.GLASS_FLUID_PIPE, new Item.Properties()); - public static final Item FUELING_PAD = ITEMS.register(Constant.Block.FUELING_PAD, new BlockItem(GCBlocks.FUELING_PAD, new Item.Properties())); - public static final Item ROCKET_LAUNCH_PAD = ITEMS.register(Constant.Block.ROCKET_LAUNCH_PAD, new BlockItem(GCBlocks.ROCKET_LAUNCH_PAD, new Item.Properties())); - - // LIGHT PANELS - public static final Item SQUARE_LIGHT_PANEL = new BlockItem(GCBlocks.SQUARE_LIGHT_PANEL, new Item.Properties()); - public static final Item SPOTLIGHT_LIGHT_PANEL = new BlockItem(GCBlocks.SPOTLIGHT_LIGHT_PANEL, new Item.Properties()); - public static final Item LINEAR_LIGHT_PANEL = new BlockItem(GCBlocks.LINEAR_LIGHT_PANEL, new Item.Properties()); - public static final Item DASHED_LIGHT_PANEL = new BlockItem(GCBlocks.DASHED_LIGHT_PANEL, new Item.Properties()); - public static final Item DIAGONAL_LIGHT_PANEL = new BlockItem(GCBlocks.DIAGONAL_LIGHT_PANEL, new Item.Properties()); - - // VACUUM GLASS - public static final Item VACUUM_GLASS = new BlockItem(GCBlocks.VACUUM_GLASS, new Item.Properties()); - public static final Item CLEAR_VACUUM_GLASS = new BlockItem(GCBlocks.CLEAR_VACUUM_GLASS, new Item.Properties()); - public static final Item STRONG_VACUUM_GLASS = new BlockItem(GCBlocks.STRONG_VACUUM_GLASS, new Item.Properties()); - - // ORES - public static final Item SILICON_ORE = new BlockItem(GCBlocks.SILICON_ORE, new Item.Properties()); - public static final Item DEEPSLATE_SILICON_ORE = new BlockItem(GCBlocks.DEEPSLATE_SILICON_ORE, new Item.Properties()); - - public static final Item MOON_COPPER_ORE = new BlockItem(GCBlocks.MOON_COPPER_ORE, new Item.Properties()); - public static final Item LUNASLATE_COPPER_ORE = new BlockItem(GCBlocks.LUNASLATE_COPPER_ORE, new Item.Properties()); - - public static final Item TIN_ORE = new BlockItem(GCBlocks.TIN_ORE, new Item.Properties()); - public static final Item DEEPSLATE_TIN_ORE = new BlockItem(GCBlocks.DEEPSLATE_TIN_ORE, new Item.Properties()); - public static final Item MOON_TIN_ORE = new BlockItem(GCBlocks.MOON_TIN_ORE, new Item.Properties()); - public static final Item LUNASLATE_TIN_ORE = new BlockItem(GCBlocks.LUNASLATE_TIN_ORE, new Item.Properties()); - - public static final Item ALUMINUM_ORE = new BlockItem(GCBlocks.ALUMINUM_ORE, new Item.Properties()); - public static final Item DEEPSLATE_ALUMINUM_ORE = new BlockItem(GCBlocks.DEEPSLATE_ALUMINUM_ORE, new Item.Properties()); - - public static final Item DESH_ORE = new BlockItem(GCBlocks.DESH_ORE, new Item.Properties()); - - public static final Item ILMENITE_ORE = new BlockItem(GCBlocks.ILMENITE_ORE, new Item.Properties()); - - public static final Item GALENA_ORE = new BlockItem(GCBlocks.GALENA_ORE, new Item.Properties()); - - // CHEESE BLOCK - public static final Item MOON_CHEESE_WHEEL = new BlockItem(GCBlocks.MOON_CHEESE_WHEEL, new Item.Properties()); - - // COMPACT MINERAL BLOCKS - public static final Item SILICON_BLOCK = new BlockItem(GCBlocks.SILICON_BLOCK, new Item.Properties()); - public static final Item METEORIC_IRON_BLOCK = new BlockItem(GCBlocks.METEORIC_IRON_BLOCK, new Item.Properties()); - public static final Item DESH_BLOCK = new BlockItem(GCBlocks.DESH_BLOCK, new Item.Properties()); - public static final Item TITANIUM_BLOCK = new BlockItem(GCBlocks.TITANIUM_BLOCK, new Item.Properties()); - public static final Item LEAD_BLOCK = new BlockItem(GCBlocks.LEAD_BLOCK, new Item.Properties()); - public static final Item LUNAR_SAPPHIRE_BLOCK = new BlockItem(GCBlocks.LUNAR_SAPPHIRE_BLOCK, new Item.Properties()); - - // MOON VILLAGER SPECIAL - public static final Item LUNAR_CARTOGRAPHY_TABLE = new BlockItem(GCBlocks.LUNAR_CARTOGRAPHY_TABLE, new Item.Properties()); - - // MISC WORLD GEN - public static final Item CAVERNOUS_VINES = new BlockItem(GCBlocks.CAVERNOUS_VINES, new Item.Properties()); - - // MISC MACHINES - public static final Item CRYOGENIC_CHAMBER = new BlockItem(GCBlocks.CRYOGENIC_CHAMBER, new Item.Properties()); - public static final Item PLAYER_TRANSPORT_TUBE = new BlockItem(GCBlocks.PLAYER_TRANSPORT_TUBE, new Item.Properties()); - public static final Item AIR_LOCK_FRAME = new BlockItem(GCBlocks.AIR_LOCK_FRAME, new Item.Properties()); - public static final Item AIR_LOCK_CONTROLLER = new BlockItem(GCBlocks.AIR_LOCK_CONTROLLER, new Item.Properties()); - public static final Item AIR_LOCK_SEAL = new BlockItem(GCBlocks.AIR_LOCK_SEAL, new Item.Properties()); - - // MACHINES - public static final Item CIRCUIT_FABRICATOR = new BlockItem(GCBlocks.CIRCUIT_FABRICATOR, new Item.Properties()); - public static final Item COMPRESSOR = new BlockItem(GCBlocks.COMPRESSOR, new Item.Properties()); - public static final Item ELECTRIC_COMPRESSOR = new BlockItem(GCBlocks.ELECTRIC_COMPRESSOR, new Item.Properties()); - public static final Item COAL_GENERATOR = new BlockItem(GCBlocks.COAL_GENERATOR, new Item.Properties()); - public static final Item BASIC_SOLAR_PANEL = new BlockItem(GCBlocks.BASIC_SOLAR_PANEL, new Item.Properties()); - public static final Item ADVANCED_SOLAR_PANEL = new BlockItem(GCBlocks.ADVANCED_SOLAR_PANEL, new Item.Properties()); - public static final Item ENERGY_STORAGE_MODULE = new BlockItem(GCBlocks.ENERGY_STORAGE_MODULE, new Item.Properties()); - public static final Item ELECTRIC_FURNACE = new BlockItem(GCBlocks.ELECTRIC_FURNACE, new Item.Properties()); - public static final Item ELECTRIC_ARC_FURNACE = new BlockItem(GCBlocks.ELECTRIC_ARC_FURNACE, new Item.Properties()); - public static final Item REFINERY = new BlockItem(GCBlocks.REFINERY, new Item.Properties()); - public static final Item OXYGEN_COLLECTOR = new BlockItem(GCBlocks.OXYGEN_COLLECTOR, new Item.Properties()); - public static final Item OXYGEN_SEALER = new BlockItem(GCBlocks.OXYGEN_SEALER, new Item.Properties()); - public static final Item OXYGEN_BUBBLE_DISTRIBUTOR = new BlockItem(GCBlocks.OXYGEN_BUBBLE_DISTRIBUTOR, new Item.Properties()); - public static final Item OXYGEN_DECOMPRESSOR = new BlockItem(GCBlocks.OXYGEN_DECOMPRESSOR, new Item.Properties()); - public static final Item OXYGEN_COMPRESSOR = new BlockItem(GCBlocks.OXYGEN_COMPRESSOR, new Item.Properties()); - public static final Item OXYGEN_STORAGE_MODULE = new BlockItem(GCBlocks.OXYGEN_STORAGE_MODULE, new Item.Properties()); - public static final Item FUEL_LOADER = new BlockItem(GCBlocks.FUEL_LOADER, new Item.Properties()); - public static final Item ROCKET_WORKBENCH = new BlockItem(GCBlocks.ROCKET_WORKBENCH, new Item.Properties()); - // === END BLOCKS === // MATERIALS - public static final Item SILICON = new Item(new Item.Properties()); + public static final Item SILICON = registerGeneric(Constant.Item.SILICON); - public static final Item RAW_METEORIC_IRON = new Item(new Item.Properties()); - public static final Item METEORIC_IRON_INGOT = new Item(new Item.Properties()); - public static final Item METEORIC_IRON_NUGGET = new Item(new Item.Properties()); - public static final Item COMPRESSED_METEORIC_IRON = new Item(new Item.Properties()); + public static final Item RAW_METEORIC_IRON = registerGeneric(Constant.Item.RAW_METEORIC_IRON); + public static final Item METEORIC_IRON_INGOT = registerGeneric(Constant.Item.METEORIC_IRON_INGOT); + public static final Item METEORIC_IRON_NUGGET = registerGeneric(Constant.Item.METEORIC_IRON_NUGGET); + public static final Item COMPRESSED_METEORIC_IRON = registerGeneric(Constant.Item.COMPRESSED_METEORIC_IRON); - public static final Item OLIVINE_SHARD = registerItem(Constant.Item.OLIVINE_SHARD, new Item(new Item.Properties())); + public static final Item OLIVINE_SHARD = registerGeneric(Constant.Item.OLIVINE_SHARD); - public static final Item RAW_DESH = new Item(new Item.Properties()); - public static final Item DESH_INGOT = new Item(new Item.Properties()); - public static final Item DESH_NUGGET = new Item(new Item.Properties()); - public static final Item COMPRESSED_DESH = new Item(new Item.Properties()); + public static final Item RAW_DESH = registerGeneric(Constant.Item.RAW_DESH); + public static final Item DESH_INGOT = registerGeneric(Constant.Item.DESH_INGOT); + public static final Item DESH_NUGGET = registerGeneric(Constant.Item.DESH_NUGGET); + public static final Item COMPRESSED_DESH = registerGeneric(Constant.Item.COMPRESSED_DESH); - public static final Item RAW_LEAD = new Item(new Item.Properties()); - public static final Item LEAD_INGOT = new Item(new Item.Properties()); - public static final Item LEAD_NUGGET = new Item(new Item.Properties()); + public static final Item RAW_LEAD = registerGeneric(Constant.Item.RAW_LEAD); + public static final Item LEAD_INGOT = registerGeneric(Constant.Item.LEAD_INGOT); + public static final Item LEAD_NUGGET = registerGeneric(Constant.Item.LEAD_NUGGET); - public static final Item RAW_ALUMINUM = new Item(new Item.Properties()); - public static final Item ALUMINUM_INGOT = new Item(new Item.Properties()); - public static final Item ALUMINUM_NUGGET = new Item(new Item.Properties()); - public static final Item COMPRESSED_ALUMINUM = new Item(new Item.Properties()); - - public static final Item RAW_TIN = new Item(new Item.Properties()); - public static final Item TIN_INGOT = new Item(new Item.Properties()); - public static final Item TIN_NUGGET = new Item(new Item.Properties()); - public static final Item COMPRESSED_TIN = new Item(new Item.Properties()); - - public static final Item RAW_TITANIUM = new Item(new Item.Properties()); - public static final Item TITANIUM_INGOT = new Item(new Item.Properties()); - public static final Item TITANIUM_NUGGET = new Item(new Item.Properties()); - public static final Item COMPRESSED_TITANIUM = new Item(new Item.Properties()); - - public static final Item COMPRESSED_BRONZE = new Item(new Item.Properties()); - public static final Item COMPRESSED_COPPER = new Item(new Item.Properties()); - public static final Item COMPRESSED_IRON = new Item(new Item.Properties()); - public static final Item COMPRESSED_STEEL = new Item(new Item.Properties()); + public static final Item RAW_ALUMINUM = registerGeneric(Constant.Item.RAW_ALUMINUM); + public static final Item ALUMINUM_INGOT = registerGeneric(Constant.Item.ALUMINUM_INGOT); + public static final Item ALUMINUM_NUGGET = registerGeneric(Constant.Item.ALUMINUM_NUGGET); + public static final Item COMPRESSED_ALUMINUM = registerGeneric(Constant.Item.COMPRESSED_ALUMINUM); + + public static final Item RAW_TIN = registerGeneric(Constant.Item.RAW_TIN); + public static final Item TIN_INGOT = registerGeneric(Constant.Item.TIN_INGOT); + public static final Item TIN_NUGGET = registerGeneric(Constant.Item.TIN_NUGGET); + public static final Item COMPRESSED_TIN = registerGeneric(Constant.Item.COMPRESSED_TIN); + + public static final Item RAW_TITANIUM = registerGeneric(Constant.Item.RAW_TITANIUM); + public static final Item TITANIUM_INGOT = registerGeneric(Constant.Item.TITANIUM_INGOT); + public static final Item TITANIUM_NUGGET = registerGeneric(Constant.Item.TITANIUM_NUGGET); + public static final Item COMPRESSED_TITANIUM = registerGeneric(Constant.Item.COMPRESSED_TITANIUM); + + public static final Item COMPRESSED_BRONZE = registerGeneric(Constant.Item.COMPRESSED_BRONZE); + public static final Item COMPRESSED_COPPER = registerGeneric(Constant.Item.COMPRESSED_COPPER); + public static final Item COMPRESSED_IRON = registerGeneric(Constant.Item.COMPRESSED_IRON); + public static final Item COMPRESSED_STEEL = registerGeneric(Constant.Item.COMPRESSED_STEEL); - public static final Item LUNAR_SAPPHIRE = new Item(new Item.Properties()); - public static final Item DESH_STICK = new Item(new Item.Properties()); - public static final Item CARBON_FRAGMENTS = new Item(new Item.Properties()); - public static final Item SOLAR_DUST = new Item(new Item.Properties()); - public static final Item BASIC_WAFER = new Item(new Item.Properties()); - public static final Item ADVANCED_WAFER = new Item(new Item.Properties()); - public static final Item BEAM_CORE = new Item(new Item.Properties()); - public static final Item CANVAS = new Item(new Item.Properties()); + public static final Item LUNAR_SAPPHIRE = registerGeneric(Constant.Item.LUNAR_SAPPHIRE); + public static final Item DESH_STICK = registerGeneric(Constant.Item.DESH_STICK); + public static final Item CARBON_FRAGMENTS = registerGeneric(Constant.Item.CARBON_FRAGMENTS); + public static final Item SOLAR_DUST = registerGeneric(Constant.Item.SOLAR_DUST); + public static final Item BASIC_WAFER = registerGeneric(Constant.Item.BASIC_WAFER); + public static final Item ADVANCED_WAFER = registerGeneric(Constant.Item.ADVANCED_WAFER); + public static final Item BEAM_CORE = registerGeneric(Constant.Item.BEAM_CORE); + public static final Item CANVAS = registerGeneric(Constant.Item.CANVAS); - public static final Item FLUID_MANIPULATOR = new Item(new Item.Properties()); - public static final Item OXYGEN_CONCENTRATOR = new Item(new Item.Properties()); - public static final Item OXYGEN_FAN = new Item(new Item.Properties()); - public static final Item OXYGEN_VENT = ITEMS.register(Constant.Item.OXYGEN_VENT, new Item(new Item.Properties())); - public static final Item SENSOR_LENS = new Item(new Item.Properties()); - public static final Item BLUE_SOLAR_WAFER = new Item(new Item.Properties()); - public static final Item SINGLE_SOLAR_MODULE = new Item(new Item.Properties()); - public static final Item FULL_SOLAR_PANEL = new Item(new Item.Properties()); - public static final Item SOLAR_ARRAY_WAFER = new Item(new Item.Properties()); - public static final Item STEEL_POLE = new Item(new Item.Properties()); - public static final Item COPPER_CANISTER = new Item(new Item.Properties()); - public static final Item TIN_CANISTER = ITEMS.register(Constant.Item.TIN_CANISTER, new Item(new Item.Properties())); - public static final Item THERMAL_CLOTH = new Item(new Item.Properties()); - public static final Item ISOTHERMAL_FABRIC = new Item(new Item.Properties()); - public static final Item ORION_DRIVE = new Item(new Item.Properties()); - public static final Item ATMOSPHERIC_VALVE = new Item(new Item.Properties()); - public static final Item AMBIENT_THERMAL_CONTROLLER = new Item(new Item.Properties()); + public static final Item FLUID_MANIPULATOR = registerGeneric(Constant.Item.FLUID_MANIPULATOR); + public static final Item OXYGEN_CONCENTRATOR = registerGeneric(Constant.Item.OXYGEN_CONCENTRATOR); + public static final Item OXYGEN_FAN = registerGeneric(Constant.Item.OXYGEN_FAN); + public static final Item OXYGEN_VENT = registerGeneric(Constant.Item.OXYGEN_VENT); + public static final Item SENSOR_LENS = registerGeneric(Constant.Item.SENSOR_LENS); + public static final Item BLUE_SOLAR_WAFER = registerGeneric(Constant.Item.BLUE_SOLAR_WAFER); + public static final Item SINGLE_SOLAR_MODULE = registerGeneric(Constant.Item.SINGLE_SOLAR_MODULE); + public static final Item FULL_SOLAR_PANEL = registerGeneric(Constant.Item.FULL_SOLAR_PANEL); + public static final Item SOLAR_ARRAY_WAFER = registerGeneric(Constant.Item.SOLAR_ARRAY_WAFER); + public static final Item STEEL_POLE = registerGeneric(Constant.Item.STEEL_POLE); + public static final Item COPPER_CANISTER = registerGeneric(Constant.Item.COPPER_CANISTER); + public static final Item TIN_CANISTER = registerGeneric(Constant.Item.TIN_CANISTER); + public static final Item THERMAL_CLOTH = registerGeneric(Constant.Item.THERMAL_CLOTH); + public static final Item ISOTHERMAL_FABRIC = registerGeneric(Constant.Item.ISOTHERMAL_FABRIC); + public static final Item ORION_DRIVE = registerGeneric(Constant.Item.ORION_DRIVE); + public static final Item ATMOSPHERIC_VALVE = registerGeneric(Constant.Item.ATMOSPHERIC_VALVE); + public static final Item AMBIENT_THERMAL_CONTROLLER = registerGeneric(Constant.Item.AMBIENT_THERMAL_CONTROLLER); // FOOD - public static final Item MOON_CHEESE_CURD = new Item(new Item.Properties().food(GCFoodComponent.MOON_CHEESE_CURD)); + public static final Item MOON_CHEESE_CURD = ITEMS.register(Constant.Item.MOON_CHEESE_CURD, new Item(new Item.Properties().food(GCFoodComponent.MOON_CHEESE_CURD))); public static final Item MOON_CHEESE_SLICE = ITEMS.register(Constant.Item.MOON_CHEESE_SLICE, new Item(new Item.Properties().food(GCFoodComponent.MOON_CHEESE_SLICE))); public static final Item BURGER_BUN = ITEMS.register(Constant.Item.BURGER_BUN, new Item(new Item.Properties().food(GCFoodComponent.BURGER_BUN))); @@ -312,11 +126,11 @@ public class GCItems { public static final Item BEEF_PATTY = ITEMS.register(Constant.Item.BEEF_PATTY, new Item(new Item.Properties().food(GCFoodComponent.BEEF_PATTY))); public static final Item CHEESEBURGER = ITEMS.register(Constant.Item.CHEESEBURGER, new Item(new Item.Properties().food(GCFoodComponent.CHEESEBURGER))); - public static final Item CANNED_DEHYDRATED_APPLE = new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_APPLE)); - public static final Item CANNED_DEHYDRATED_CARROT = new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_CARROT)); - public static final Item CANNED_DEHYDRATED_MELON = new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_MELON)); - public static final Item CANNED_DEHYDRATED_POTATO = new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_POTATO)); - public static final Item CANNED_BEEF = new CannedFoodItem(new Item.Properties().food(GCFoodComponent.CANNED_BEEF)); + public static final Item CANNED_DEHYDRATED_APPLE = ITEMS.register(Constant.Item.CANNED_DEHYDRATED_APPLE, new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_APPLE))); + public static final Item CANNED_DEHYDRATED_CARROT = ITEMS.register(Constant.Item.CANNED_DEHYDRATED_CARROT, new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_CARROT))); + public static final Item CANNED_DEHYDRATED_MELON = ITEMS.register(Constant.Item.CANNED_DEHYDRATED_MELON, new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_MELON))); + public static final Item CANNED_DEHYDRATED_POTATO = ITEMS.register(Constant.Item.CANNED_DEHYDRATED_POTATO, new CannedFoodItem(new Item.Properties().food(GCFoodComponent.DEHYDRATED_POTATO))); + public static final Item CANNED_BEEF = ITEMS.register(Constant.Item.CANNED_BEEF, new CannedFoodItem(new Item.Properties().food(GCFoodComponent.CANNED_BEEF))); // ROCKET PLATES public static final Item TIER_1_HEAVY_DUTY_PLATE = ITEMS.register(Constant.Item.TIER_1_HEAVY_DUTY_PLATE, new Item(new Item.Properties())); @@ -324,50 +138,50 @@ public class GCItems { public static final Item TIER_3_HEAVY_DUTY_PLATE = ITEMS.register(Constant.Item.TIER_3_HEAVY_DUTY_PLATE, new Item(new Item.Properties())); // THROWABLE METEOR CHUNKS - public static final Item THROWABLE_METEOR_CHUNK = new ThrowableMeteorChunkItem(new Item.Properties().stacksTo(16)); - public static final Item HOT_THROWABLE_METEOR_CHUNK = new HotThrowableMeteorChunkItem(new Item.Properties().stacksTo(16)); + public static final Item THROWABLE_METEOR_CHUNK = ITEMS.register(Constant.Item.THROWABLE_METEOR_CHUNK, new ThrowableMeteorChunkItem(new Item.Properties().stacksTo(16))); + public static final Item HOT_THROWABLE_METEOR_CHUNK = ITEMS.register(Constant.Item.HOT_THROWABLE_METEOR_CHUNK, new HotThrowableMeteorChunkItem(new Item.Properties().stacksTo(16))); // ARMOR - public static final Item HEAVY_DUTY_HELMET = new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1)); - public static final Item HEAVY_DUTY_CHESTPLATE = new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1)); - public static final Item HEAVY_DUTY_LEGGINGS = new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1)); - public static final Item HEAVY_DUTY_BOOTS = new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1)); + public static final Item HEAVY_DUTY_HELMET = ITEMS.register(Constant.Item.HEAVY_DUTY_HELMET, new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1))); + public static final Item HEAVY_DUTY_CHESTPLATE = ITEMS.register(Constant.Item.HEAVY_DUTY_CHESTPLATE, new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1))); + public static final Item HEAVY_DUTY_LEGGINGS = ITEMS.register(Constant.Item.HEAVY_DUTY_LEGGINGS, new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1))); + public static final Item HEAVY_DUTY_BOOTS = ITEMS.register(Constant.Item.HEAVY_DUTY_BOOTS, new ArmorItem(GCArmorMaterials.HEAVY_DUTY, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1))); - public static final Item DESH_HELMET = new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1)); - public static final Item DESH_CHESTPLATE = new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1)); - public static final Item DESH_LEGGINGS = new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1)); - public static final Item DESH_BOOTS = new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1)); + public static final Item DESH_HELMET = ITEMS.register(Constant.Item.DESH_HELMET, new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1))); + public static final Item DESH_CHESTPLATE = ITEMS.register(Constant.Item.DESH_CHESTPLATE, new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1))); + public static final Item DESH_LEGGINGS = ITEMS.register(Constant.Item.DESH_LEGGINGS, new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1))); + public static final Item DESH_BOOTS = ITEMS.register(Constant.Item.DESH_BOOTS, new ArmorItem(GCArmorMaterials.DESH, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1))); - public static final Item TITANIUM_HELMET = new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1)); - public static final Item TITANIUM_CHESTPLATE = new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1)); - public static final Item TITANIUM_LEGGINGS = new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1)); - public static final Item TITANIUM_BOOTS = new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1)); + public static final Item TITANIUM_HELMET = ITEMS.register(Constant.Item.TITANIUM_HELMET, new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1))); + public static final Item TITANIUM_CHESTPLATE = ITEMS.register(Constant.Item.TITANIUM_CHESTPLATE, new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.CHESTPLATE, new Item.Properties().stacksTo(1))); + public static final Item TITANIUM_LEGGINGS = ITEMS.register(Constant.Item.TITANIUM_LEGGINGS, new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.LEGGINGS, new Item.Properties().stacksTo(1))); + public static final Item TITANIUM_BOOTS = ITEMS.register(Constant.Item.TITANIUM_BOOTS, new ArmorItem(GCArmorMaterials.TITANIUM, ArmorItem.Type.BOOTS, new Item.Properties().stacksTo(1))); - public static final Item SENSOR_GLASSES = new ArmorItem(GCArmorMaterials.SENSOR_GLASSES, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1)); + public static final Item SENSOR_GLASSES = ITEMS.register(Constant.Item.SENSOR_GLASSES, new ArmorItem(GCArmorMaterials.SENSOR_GLASSES, ArmorItem.Type.HELMET, new Item.Properties().stacksTo(1))); // TOOLS + WEAPONS - public static final Item HEAVY_DUTY_SWORD = new BrittleSwordItem(GCTiers.STEEL, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.STEEL, 3, -2.4F))); - public static final Item HEAVY_DUTY_SHOVEL = new ShovelItem(GCTiers.STEEL, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.STEEL, -1.5F, -3.0F))); - public static final Item HEAVY_DUTY_PICKAXE = new PickaxeItem(GCTiers.STEEL, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.STEEL, 1, -2.8F))); - public static final Item HEAVY_DUTY_AXE = new AxeItem(GCTiers.STEEL, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.STEEL, 6.0F, -3.1F))); - public static final Item HEAVY_DUTY_HOE = new HoeItem(GCTiers.STEEL, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.STEEL, -2, -1.0F))); - - public static final Item DESH_SWORD = new SwordItem(GCTiers.DESH, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.DESH, 3, -2.4F))); - public static final Item DESH_SHOVEL = new ShovelItem(GCTiers.DESH, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.DESH, -1.5F, -3.0F))); - public static final Item DESH_PICKAXE = new PickaxeItem(GCTiers.DESH, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.DESH, 1.0F, -2.8F))); - public static final Item DESH_AXE = new AxeItem(GCTiers.DESH, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.DESH, 6.0F, -3.1F))); - public static final Item DESH_HOE = new HoeItem(GCTiers.DESH, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.DESH, -3.0F, -1.0F))); - - public static final Item TITANIUM_SWORD = new BrittleSwordItem(GCTiers.TITANIUM, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.TITANIUM, 3, -2.4F))); - public static final Item TITANIUM_SHOVEL = new ShovelItem(GCTiers.TITANIUM, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.TITANIUM, -1.5F, -3.0F))); - public static final Item TITANIUM_PICKAXE = new PickaxeItem(GCTiers.TITANIUM, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.TITANIUM, 1.0F, -2.8F))); - public static final Item TITANIUM_AXE = new AxeItem(GCTiers.TITANIUM, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.TITANIUM, 6.0F, -3.1F))); - public static final Item TITANIUM_HOE = new HoeItem(GCTiers.TITANIUM, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.TITANIUM, -3.0F, -1.0F))); - - public static final Item STANDARD_WRENCH = new StandardWrenchItem(new Item.Properties().durability(256)); + public static final Item HEAVY_DUTY_SWORD = ITEMS.register(Constant.Item.HEAVY_DUTY_SWORD, new BrittleSwordItem(GCTiers.STEEL, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.STEEL, 3, -2.4F)))); + public static final Item HEAVY_DUTY_SHOVEL = ITEMS.register(Constant.Item.HEAVY_DUTY_SHOVEL, new ShovelItem(GCTiers.STEEL, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.STEEL, -1.5F, -3.0F)))); + public static final Item HEAVY_DUTY_PICKAXE = ITEMS.register(Constant.Item.HEAVY_DUTY_PICKAXE, new PickaxeItem(GCTiers.STEEL, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.STEEL, 1, -2.8F)))); + public static final Item HEAVY_DUTY_AXE = ITEMS.register(Constant.Item.HEAVY_DUTY_AXE, new AxeItem(GCTiers.STEEL, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.STEEL, 6.0F, -3.1F)))); + public static final Item HEAVY_DUTY_HOE = ITEMS.register(Constant.Item.HEAVY_DUTY_HOE, new HoeItem(GCTiers.STEEL, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.STEEL, -2, -1.0F)))); + + public static final Item DESH_SWORD = ITEMS.register(Constant.Item.DESH_SWORD, new SwordItem(GCTiers.DESH, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.DESH, 3, -2.4F)))); + public static final Item DESH_SHOVEL = ITEMS.register(Constant.Item.DESH_SHOVEL, new ShovelItem(GCTiers.DESH, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.DESH, -1.5F, -3.0F)))); + public static final Item DESH_PICKAXE = ITEMS.register(Constant.Item.DESH_PICKAXE, new PickaxeItem(GCTiers.DESH, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.DESH, 1.0F, -2.8F)))); + public static final Item DESH_AXE = ITEMS.register(Constant.Item.DESH_AXE, new AxeItem(GCTiers.DESH, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.DESH, 6.0F, -3.1F)))); + public static final Item DESH_HOE = ITEMS.register(Constant.Item.DESH_HOE, new HoeItem(GCTiers.DESH, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.DESH, -3.0F, -1.0F)))); + + public static final Item TITANIUM_SWORD = ITEMS.register(Constant.Item.TITANIUM_SWORD, new BrittleSwordItem(GCTiers.TITANIUM, new Item.Properties().attributes(SwordItem.createAttributes(GCTiers.TITANIUM, 3, -2.4F)))); + public static final Item TITANIUM_SHOVEL = ITEMS.register(Constant.Item.TITANIUM_SHOVEL, new ShovelItem(GCTiers.TITANIUM, new Item.Properties().attributes(ShovelItem.createAttributes(GCTiers.TITANIUM, -1.5F, -3.0F)))); + public static final Item TITANIUM_PICKAXE = ITEMS.register(Constant.Item.TITANIUM_PICKAXE, new PickaxeItem(GCTiers.TITANIUM, new Item.Properties().attributes(PickaxeItem.createAttributes(GCTiers.TITANIUM, 1.0F, -2.8F)))); + public static final Item TITANIUM_AXE = ITEMS.register(Constant.Item.TITANIUM_AXE, new AxeItem(GCTiers.TITANIUM, new Item.Properties().attributes(AxeItem.createAttributes(GCTiers.TITANIUM, 6.0F, -3.1F)))); + public static final Item TITANIUM_HOE = ITEMS.register(Constant.Item.TITANIUM_HOE, new HoeItem(GCTiers.TITANIUM, new Item.Properties().attributes(HoeItem.createAttributes(GCTiers.TITANIUM, -3.0F, -1.0F)))); + + public static final Item STANDARD_WRENCH = ITEMS.register(Constant.Item.STANDARD_WRENCH, new StandardWrenchItem(new Item.Properties().durability(256))); // SMITHING TEMPLATES - public static final Item TITANTIUM_UPGRADE_SMITHING_TEMPLATE = new SmithingTemplateItem( + public static final Item TITANTIUM_UPGRADE_SMITHING_TEMPLATE = ITEMS.register(Constant.Item.TITANTIUM_UPGRADE_SMITHING_TEMPLATE, new SmithingTemplateItem( Component.translatable(Translations.Misc.UPGRADE_TITANIUM_APPLIES_TO).withStyle(Constant.Text.BLUE_STYLE), Component.translatable(Translations.Misc.UPGRADE_TITANIUM_INGREDIENTS).withStyle(Constant.Text.BLUE_STYLE), Component.translatable(Translations.Misc.UPGRADE_TITANIUM_DESCRIPTION).withStyle(Constant.Text.GRAY_STYLE), @@ -383,7 +197,7 @@ public class GCItems { ResourceLocation.withDefaultNamespace("item/empty_slot_shovel"), ResourceLocation.withDefaultNamespace("item/empty_slot_pickaxe")), List.of(ResourceLocation.withDefaultNamespace("item/empty_slot_ingot")) - ); + )); // this.appliesTo = component; // this.ingredients = component2; // this.upgradeDescription = component3; @@ -391,32 +205,32 @@ public class GCItems { // this.additionsSlotDescription = component5; // BATTERIES - public static final Item BATTERY = new BatteryItem(new Item.Properties().stacksTo(1), 15000, 500); - public static final Item INFINITE_BATTERY = new InfiniteBatteryItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + public static final Item BATTERY = ITEMS.register(Constant.Item.BATTERY, new BatteryItem(new Item.Properties().stacksTo(1), 15000, 500)); + public static final Item INFINITE_BATTERY = ITEMS.register(Constant.Item.INFINITE_BATTERY, new InfiniteBatteryItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC))); //FLUID BUCKETS - public static final Item CRUDE_OIL_BUCKET = new BucketItem(GCFluids.CRUDE_OIL, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1)); - public static final Item FUEL_BUCKET = new BucketItem(GCFluids.FUEL, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1)); - public static final Item SULFURIC_ACID_BUCKET = new BucketItem(GCFluids.SULFURIC_ACID, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1)); + public static final Item CRUDE_OIL_BUCKET = ITEMS.register(Constant.Item.CRUDE_OIL_BUCKET, new BucketItem(GCFluids.CRUDE_OIL, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); + public static final Item FUEL_BUCKET = ITEMS.register(Constant.Item.FUEL_BUCKET, new BucketItem(GCFluids.FUEL, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); + public static final Item SULFURIC_ACID_BUCKET = ITEMS.register(Constant.Item.SULFURIC_ACID_BUCKET, new BucketItem(GCFluids.SULFURIC_ACID, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))); //GALACTICRAFT INVENTORY public static final GCRegistry.ColorSet PARACHUTE = ITEMS.registerColored(Constant.Item.PARACHUTE, color -> new ParachuteItem(color, new Item.Properties().stacksTo(1))); - public static final Item OXYGEN_MASK = new OxygenMaskItem(new Item.Properties()); - public static final Item OXYGEN_GEAR = new OxygenGearItem(new Item.Properties()); + public static final Item OXYGEN_MASK = ITEMS.register(Constant.Item.OXYGEN_MASK, new OxygenMaskItem(new Item.Properties())); + public static final Item OXYGEN_GEAR = ITEMS.register(Constant.Item.OXYGEN_GEAR, new OxygenGearItem(new Item.Properties())); - public static final Item SMALL_OXYGEN_TANK = new OxygenTankItem(new Item.Properties(), 1620 * 10); // 16200 ticks - public static final Item MEDIUM_OXYGEN_TANK = new OxygenTankItem(new Item.Properties(), 1620 * 20); //32400 ticks - public static final Item LARGE_OXYGEN_TANK = new OxygenTankItem(new Item.Properties(), 1620 * 30); //48600 ticks - public static final Item INFINITE_OXYGEN_TANK = new InfiniteOxygenTankItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)); + public static final Item SMALL_OXYGEN_TANK = ITEMS.register(Constant.Item.SMALL_OXYGEN_TANK, new OxygenTankItem(new Item.Properties(), 1620 * 10)); // 16200 ticks + public static final Item MEDIUM_OXYGEN_TANK = ITEMS.register(Constant.Item.MEDIUM_OXYGEN_TANK, new OxygenTankItem(new Item.Properties(), 1620 * 20)); //32400 ticks + public static final Item LARGE_OXYGEN_TANK = ITEMS.register(Constant.Item.LARGE_OXYGEN_TANK, new OxygenTankItem(new Item.Properties(), 1620 * 30)); //48600 ticks + public static final Item INFINITE_OXYGEN_TANK = ITEMS.register(Constant.Item.INFINITE_OXYGEN_TANK, new InfiniteOxygenTankItem(new Item.Properties().stacksTo(1).rarity(Rarity.EPIC))); - public static final Item SHIELD_CONTROLLER = new AccessoryItem(new Item.Properties()); - public static final Item FREQUENCY_MODULE = new FrequencyModuleItem(new Item.Properties()); + public static final Item SHIELD_CONTROLLER = ITEMS.register(Constant.Item.SHIELD_CONTROLLER, new AccessoryItem(new Item.Properties())); + public static final Item FREQUENCY_MODULE = ITEMS.register(Constant.Item.FREQUENCY_MODULE, new FrequencyModuleItem(new Item.Properties())); - public static final Item THERMAL_PADDING_HELMET = new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.HELMET); - public static final Item THERMAL_PADDING_CHESTPIECE = new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.CHESTPLATE); - public static final Item THERMAL_PADDING_LEGGINGS = new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.LEGGINGS); - public static final Item THERMAL_PADDING_BOOTS = new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.BOOTS); + public static final Item THERMAL_PADDING_HELMET = ITEMS.register(Constant.Item.THERMAL_PADDING_HELMET, new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.HELMET)); + public static final Item THERMAL_PADDING_CHESTPIECE = ITEMS.register(Constant.Item.THERMAL_PADDING_CHESTPIECE, new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.CHESTPLATE)); + public static final Item THERMAL_PADDING_LEGGINGS = ITEMS.register(Constant.Item.THERMAL_PADDING_LEGGINGS, new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.LEGGINGS)); + public static final Item THERMAL_PADDING_BOOTS = ITEMS.register(Constant.Item.THERMAL_PADDING_BOOTS, new ThermalArmorItem(new Item.Properties(), ArmorItem.Type.BOOTS)); // Vehicles public static final Item BUGGY = ITEMS.register(Constant.Item.BUGGY, new BuggyItem(new Item.Properties().stacksTo(1))); public static final Item ROCKET = ITEMS.register(Constant.Item.ROCKET, new RocketItem(new Item.Properties() @@ -430,391 +244,38 @@ public class GCItems { public static final Item ROCKET_ENGINE = ITEMS.register(Constant.Item.ROCKET_ENGINE, new Item(new Item.Properties())); // SCHEMATICS - public static final Item BASIC_ROCKET_CONE_SCHEMATIC = new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_CONE); - public static final Item BASIC_ROCKET_BODY_SCHEMATIC = new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_BODY); - public static final Item BASIC_ROCKET_FINS_SCHEMATIC = new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_FIN); - public static final Item BASIC_ROCKET_ENGINE_SCHEMATIC = new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_ENGINE); + public static final Item BASIC_ROCKET_CONE_SCHEMATIC = ITEMS.register(Constant.Item.BASIC_ROCKET_CONE_SCHEMATIC, new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_CONE)); + public static final Item BASIC_ROCKET_BODY_SCHEMATIC = ITEMS.register(Constant.Item.BASIC_ROCKET_BODY_SCHEMATIC, new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_BODY)); + public static final Item BASIC_ROCKET_FINS_SCHEMATIC = ITEMS.register(Constant.Item.BASIC_ROCKET_FINS_SCHEMATIC, new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_FIN)); + public static final Item BASIC_ROCKET_ENGINE_SCHEMATIC = ITEMS.register(Constant.Item.BASIC_ROCKET_ENGINE_SCHEMATIC, new RocketPartSchematic(new Item.Properties().stacksTo(1).rarity(Rarity.RARE), GCRocketParts.TIER_1_ENGINE)); - public static final Item TIER_2_ROCKET_SCHEMATIC = new SchematicItem(new Item.Properties()); - public static final Item CARGO_ROCKET_SCHEMATIC = new SchematicItem(new Item.Properties()); - public static final Item MOON_BUGGY_SCHEMATIC = new SchematicItem(new Item.Properties()); - public static final Item TIER_3_ROCKET_SCHEMATIC = new SchematicItem(new Item.Properties()); - public static final Item ASTRO_MINER_SCHEMATIC = new SchematicItem(new Item.Properties()); + public static final Item TIER_2_ROCKET_SCHEMATIC = ITEMS.register(Constant.Item.TIER_2_ROCKET_SCHEMATIC, new SchematicItem(new Item.Properties())); + public static final Item CARGO_ROCKET_SCHEMATIC = ITEMS.register(Constant.Item.CARGO_ROCKET_SCHEMATIC, new SchematicItem(new Item.Properties())); + public static final Item MOON_BUGGY_SCHEMATIC = ITEMS.register(Constant.Item.MOON_BUGGY_SCHEMATIC, new SchematicItem(new Item.Properties())); + public static final Item TIER_3_ROCKET_SCHEMATIC = ITEMS.register(Constant.Item.TIER_3_ROCKET_SCHEMATIC, new SchematicItem(new Item.Properties())); + public static final Item ASTRO_MINER_SCHEMATIC = ITEMS.register(Constant.Item.ASTRO_MINER_SCHEMATIC, new SchematicItem(new Item.Properties())); // SPAWN EGGS - public static final Item MOON_VILLAGER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.MOON_VILLAGER, 0x74a3cf, 0xba2500, new Item.Properties()); - public static final Item EVOLVED_ZOMBIE_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_ZOMBIE, 0x00afaf, 0x463aa5, new Item.Properties()); - public static final Item EVOLVED_CREEPER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_CREEPER, 0x0da70b, 0xa8d0d9, new Item.Properties()); - public static final Item EVOLVED_SKELETON_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_SKELETON, 0xc1c1c1, 0xff9600, new Item.Properties()); - public static final Item EVOLVED_SPIDER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_SPIDER, 0x342d27, 0x5aff0e, new Item.Properties()); - public static final Item EVOLVED_PILLAGER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_PILLAGER, 0x532f36, 0x264747, new Item.Properties()); - public static final Item EVOLVED_EVOKER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_EVOKER, 0x1e1c1a, 0xd3cf99, new Item.Properties()); - public static final Item EVOLVED_VINDICATOR_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.EVOLVED_VINDICATOR, 0x3f3b37, 0x275e61, new Item.Properties()); - public static final Item GAZER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.GAZER, 0xdbdddb, 0x5c5c5c, new Item.Properties()); - public static final Item RUMBLER_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.RUMBLER, 0x5c5c5c, 0x36383e, new Item.Properties()); - public static final Item COMET_CUBE_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.COMET_CUBE, 0xd5d8d8, 0x92b9fe, new Item.Properties()); - public static final Item OLI_GRUB_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.OLI_GRUB, 0xd4dd7e, 0xa4bf63, new Item.Properties()); - public static final Item GREY_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.GREY, 0x656463, 0x769e41, new Item.Properties()); - public static final Item ARCH_GREY_SPAWN_EGG = new SpawnEggItem(GCEntityTypes.ARCH_GREY, 0x656463, 0x2d8563, new Item.Properties()); - - public static Item registerItem(String id, Item item) { - return Registry.register(BuiltInRegistries.ITEM, Constant.id(id), item); + public static final Item MOON_VILLAGER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.MOON_VILLAGER, new SpawnEggItem(GCEntityTypes.MOON_VILLAGER, 0x74a3cf, 0xba2500, new Item.Properties())); + public static final Item EVOLVED_ZOMBIE_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_ZOMBIE, new SpawnEggItem(GCEntityTypes.EVOLVED_ZOMBIE, 0x00afaf, 0x463aa5, new Item.Properties())); + public static final Item EVOLVED_CREEPER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_CREEPER, new SpawnEggItem(GCEntityTypes.EVOLVED_CREEPER, 0x0da70b, 0xa8d0d9, new Item.Properties())); + public static final Item EVOLVED_SKELETON_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_SKELETON, new SpawnEggItem(GCEntityTypes.EVOLVED_SKELETON, 0xc1c1c1, 0xff9600, new Item.Properties())); + public static final Item EVOLVED_SPIDER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_SPIDER, new SpawnEggItem(GCEntityTypes.EVOLVED_SPIDER, 0x342d27, 0x5aff0e, new Item.Properties())); + public static final Item EVOLVED_PILLAGER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_PILLAGER, new SpawnEggItem(GCEntityTypes.EVOLVED_PILLAGER, 0x532f36, 0x264747, new Item.Properties())); + public static final Item EVOLVED_EVOKER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_EVOKER, new SpawnEggItem(GCEntityTypes.EVOLVED_EVOKER, 0x1e1c1a, 0xd3cf99, new Item.Properties())); + public static final Item EVOLVED_VINDICATOR_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.EVOLVED_VINDICATOR, new SpawnEggItem(GCEntityTypes.EVOLVED_VINDICATOR, 0x3f3b37, 0x275e61, new Item.Properties())); + public static final Item GAZER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.GAZER, new SpawnEggItem(GCEntityTypes.GAZER, 0xdbdddb, 0x5c5c5c, new Item.Properties())); + public static final Item RUMBLER_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.RUMBLER, new SpawnEggItem(GCEntityTypes.RUMBLER, 0x5c5c5c, 0x36383e, new Item.Properties())); + public static final Item COMET_CUBE_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.COMET_CUBE, new SpawnEggItem(GCEntityTypes.COMET_CUBE, 0xd5d8d8, 0x92b9fe, new Item.Properties())); + public static final Item OLI_GRUB_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.OLI_GRUB, new SpawnEggItem(GCEntityTypes.OLI_GRUB, 0xd4dd7e, 0xa4bf63, new Item.Properties())); + public static final Item GREY_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.GREY, new SpawnEggItem(GCEntityTypes.GREY, 0x656463, 0x769e41, new Item.Properties())); + public static final Item ARCH_GREY_SPAWN_EGG = ITEMS.register(Constant.SpawnEgg.ARCH_GREY, new SpawnEggItem(GCEntityTypes.ARCH_GREY, 0x656463, 0x2d8563, new Item.Properties())); + + private static Item registerGeneric(String id) { + return ITEMS.register(id, new Item(new Item.Properties())); } public static void register() { - // === START BLOCKS === - - // MOON NATURAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_TURF), MOON_TURF); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_DIRT), MOON_DIRT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_DIRT_PATH), MOON_DIRT_PATH); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_SURFACE_ROCK), MOON_SURFACE_ROCK); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK), MOON_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_SLAB), MOON_ROCK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_STAIRS), MOON_ROCK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_WALL), MOON_ROCK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_BRICK), MOON_ROCK_BRICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_BRICK_SLAB), MOON_ROCK_BRICK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_BRICK_STAIRS), MOON_ROCK_BRICK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_BRICK_WALL), MOON_ROCK_BRICK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_ROCK_BRICK), CRACKED_MOON_ROCK_BRICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_ROCK_BRICK_SLAB), CRACKED_MOON_ROCK_BRICK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_ROCK_BRICK_STAIRS), CRACKED_MOON_ROCK_BRICK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_ROCK_BRICK_WALL), CRACKED_MOON_ROCK_BRICK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.POLISHED_MOON_ROCK), POLISHED_MOON_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.POLISHED_MOON_ROCK_SLAB), POLISHED_MOON_ROCK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.POLISHED_MOON_ROCK_STAIRS), POLISHED_MOON_ROCK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.POLISHED_MOON_ROCK_WALL), POLISHED_MOON_ROCK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CHISELED_MOON_ROCK_BRICK), CHISELED_MOON_ROCK_BRICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_ROCK_PILLAR), MOON_ROCK_PILLAR); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_MOON_ROCK), COBBLED_MOON_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_MOON_ROCK_SLAB), COBBLED_MOON_ROCK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_MOON_ROCK_STAIRS), COBBLED_MOON_ROCK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_MOON_ROCK_WALL), COBBLED_MOON_ROCK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE), LUNASLATE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE_SLAB), LUNASLATE_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE_STAIRS), LUNASLATE_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE_WALL), LUNASLATE_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_LUNASLATE), COBBLED_LUNASLATE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_LUNASLATE_SLAB), COBBLED_LUNASLATE_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_LUNASLATE_STAIRS), COBBLED_LUNASLATE_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COBBLED_LUNASLATE_WALL), COBBLED_LUNASLATE_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT), MOON_BASALT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_SLAB), MOON_BASALT_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_STAIRS), MOON_BASALT_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_WALL), MOON_BASALT_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_BRICK), MOON_BASALT_BRICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_BRICK_SLAB), MOON_BASALT_BRICK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_BRICK_STAIRS), MOON_BASALT_BRICK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_BASALT_BRICK_WALL), MOON_BASALT_BRICK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_BASALT_BRICK), CRACKED_MOON_BASALT_BRICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_BASALT_BRICK_SLAB), CRACKED_MOON_BASALT_BRICK_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_BASALT_BRICK_STAIRS), CRACKED_MOON_BASALT_BRICK_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRACKED_MOON_BASALT_BRICK_WALL), CRACKED_MOON_BASALT_BRICK_WALL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.FALLEN_METEOR), FALLEN_METEOR); - - // MARS NATURAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_SURFACE_ROCK), MARS_SURFACE_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_SUB_SURFACE_ROCK), MARS_SUB_SURFACE_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_STONE), MARS_STONE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_STONE_SLAB), MARS_STONE_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_STONE_STAIRS), MARS_STONE_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_STONE_WALL), MARS_STONE_WALL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_COBBLESTONE), MARS_COBBLESTONE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_COBBLESTONE_SLAB), MARS_COBBLESTONE_SLAB); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_COBBLESTONE_STAIRS), MARS_COBBLESTONE_STAIRS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MARS_COBBLESTONE_WALL), MARS_COBBLESTONE_WALL); - - // ASTEROID NATURAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ASTEROID_ROCK), ASTEROID_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ASTEROID_ROCK_1), ASTEROID_ROCK_1); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ASTEROID_ROCK_2), ASTEROID_ROCK_2); - - // VENUS NATURAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SOFT_VENUS_ROCK), SOFT_VENUS_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.HARD_VENUS_ROCK), HARD_VENUS_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SCORCHED_VENUS_ROCK), SCORCHED_VENUS_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.VOLCANIC_ROCK), VOLCANIC_ROCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.PUMICE), PUMICE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.VAPOR_SPOUT), VAPOR_SPOUT); - - // MISC DECOR - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.WALKWAY), WALKWAY); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.FLUID_PIPE_WALKWAY), FLUID_PIPE_WALKWAY); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.WIRE_WALKWAY), WIRE_WALKWAY); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.TIN_LADDER), TIN_LADDER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.IRON_GRATING), IRON_GRATING); - - // SPECIAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ALUMINUM_WIRE), ALUMINUM_WIRE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SEALABLE_ALUMINUM_WIRE), SEALABLE_ALUMINUM_WIRE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.HEAVY_SEALABLE_ALUMINUM_WIRE), HEAVY_SEALABLE_ALUMINUM_WIRE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.GLASS_FLUID_PIPE), GLASS_FLUID_PIPE); - - // LIGHT PANELS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SQUARE_LIGHT_PANEL), SQUARE_LIGHT_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SPOTLIGHT_LIGHT_PANEL), SPOTLIGHT_LIGHT_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LINEAR_LIGHT_PANEL), LINEAR_LIGHT_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DASHED_LIGHT_PANEL), DASHED_LIGHT_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DIAGONAL_LIGHT_PANEL), DIAGONAL_LIGHT_PANEL); - - // VACUUM GLASS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.VACUUM_GLASS), VACUUM_GLASS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CLEAR_VACUUM_GLASS), CLEAR_VACUUM_GLASS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.STRONG_VACUUM_GLASS), STRONG_VACUUM_GLASS); - - // ORES - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SILICON_ORE), SILICON_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DEEPSLATE_SILICON_ORE), DEEPSLATE_SILICON_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_COPPER_ORE), MOON_COPPER_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE_COPPER_ORE), LUNASLATE_COPPER_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.TIN_ORE), TIN_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DEEPSLATE_TIN_ORE), DEEPSLATE_TIN_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_TIN_ORE), MOON_TIN_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNASLATE_TIN_ORE), LUNASLATE_TIN_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ALUMINUM_ORE), ALUMINUM_ORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DEEPSLATE_ALUMINUM_ORE), DEEPSLATE_ALUMINUM_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DESH_ORE), DESH_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ILMENITE_ORE), ILMENITE_ORE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.GALENA_ORE), GALENA_ORE); - - // CHEESE BLOCK - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.MOON_CHEESE_WHEEL), MOON_CHEESE_WHEEL); - - // COMPACT MINERAL BLOCKS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.SILICON_BLOCK), SILICON_BLOCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.METEORIC_IRON_BLOCK), METEORIC_IRON_BLOCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.DESH_BLOCK), DESH_BLOCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.TITANIUM_BLOCK), TITANIUM_BLOCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LEAD_BLOCK), LEAD_BLOCK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNAR_SAPPHIRE_BLOCK), LUNAR_SAPPHIRE_BLOCK); - - // MOON VILLAGER SPECIAL - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.LUNAR_CARTOGRAPHY_TABLE), LUNAR_CARTOGRAPHY_TABLE); - - // MISC WORLD GEN - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CAVERNOUS_VINES), CAVERNOUS_VINES); - - // MISC MACHINES - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CRYOGENIC_CHAMBER), CRYOGENIC_CHAMBER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.PLAYER_TRANSPORT_TUBE), PLAYER_TRANSPORT_TUBE); - - // MACHINES - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.CIRCUIT_FABRICATOR), CIRCUIT_FABRICATOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COMPRESSOR), COMPRESSOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ELECTRIC_COMPRESSOR), ELECTRIC_COMPRESSOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.COAL_GENERATOR), COAL_GENERATOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.BASIC_SOLAR_PANEL), BASIC_SOLAR_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ADVANCED_SOLAR_PANEL), ADVANCED_SOLAR_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ENERGY_STORAGE_MODULE), ENERGY_STORAGE_MODULE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ELECTRIC_FURNACE), ELECTRIC_FURNACE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ELECTRIC_ARC_FURNACE), ELECTRIC_ARC_FURNACE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.REFINERY), REFINERY); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_COLLECTOR), OXYGEN_COLLECTOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_SEALER), OXYGEN_SEALER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_BUBBLE_DISTRIBUTOR), OXYGEN_BUBBLE_DISTRIBUTOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_DECOMPRESSOR), OXYGEN_DECOMPRESSOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_COMPRESSOR), OXYGEN_COMPRESSOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.OXYGEN_STORAGE_MODULE), OXYGEN_STORAGE_MODULE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.FUEL_LOADER), FUEL_LOADER); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.ROCKET_WORKBENCH), ROCKET_WORKBENCH); - // === END BLOCKS === - - // MATERIALS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SILICON), SILICON); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_METEORIC_IRON), RAW_METEORIC_IRON); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.METEORIC_IRON_INGOT), METEORIC_IRON_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.METEORIC_IRON_NUGGET), METEORIC_IRON_NUGGET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_METEORIC_IRON), COMPRESSED_METEORIC_IRON); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_DESH), RAW_DESH); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_INGOT), DESH_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_NUGGET), DESH_NUGGET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_DESH), COMPRESSED_DESH); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_LEAD), RAW_LEAD); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LEAD_INGOT), LEAD_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LEAD_NUGGET), LEAD_NUGGET); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_ALUMINUM), RAW_ALUMINUM); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ALUMINUM_INGOT), ALUMINUM_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ALUMINUM_NUGGET), ALUMINUM_NUGGET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_ALUMINUM), COMPRESSED_ALUMINUM); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_TIN), RAW_TIN); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TIN_INGOT), TIN_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TIN_NUGGET), TIN_NUGGET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_TIN), COMPRESSED_TIN); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.RAW_TITANIUM), RAW_TITANIUM); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_INGOT), TITANIUM_INGOT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_NUGGET), TITANIUM_NUGGET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_TITANIUM), COMPRESSED_TITANIUM); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_BRONZE), COMPRESSED_BRONZE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_COPPER), COMPRESSED_COPPER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_IRON), COMPRESSED_IRON); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COMPRESSED_STEEL), COMPRESSED_STEEL); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LUNAR_SAPPHIRE), LUNAR_SAPPHIRE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_STICK), DESH_STICK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CARBON_FRAGMENTS), CARBON_FRAGMENTS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SOLAR_DUST), SOLAR_DUST); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_WAFER), BASIC_WAFER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ADVANCED_WAFER), ADVANCED_WAFER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BEAM_CORE), BEAM_CORE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANVAS), CANVAS); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.FLUID_MANIPULATOR), FLUID_MANIPULATOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.OXYGEN_CONCENTRATOR), OXYGEN_CONCENTRATOR); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.OXYGEN_FAN), OXYGEN_FAN); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SENSOR_LENS), SENSOR_LENS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BLUE_SOLAR_WAFER), BLUE_SOLAR_WAFER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SINGLE_SOLAR_MODULE), SINGLE_SOLAR_MODULE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.FULL_SOLAR_PANEL), FULL_SOLAR_PANEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SOLAR_ARRAY_WAFER), SOLAR_ARRAY_WAFER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.STEEL_POLE), STEEL_POLE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.COPPER_CANISTER), COPPER_CANISTER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THERMAL_CLOTH), THERMAL_CLOTH); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ISOTHERMAL_FABRIC), ISOTHERMAL_FABRIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ORION_DRIVE), ORION_DRIVE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ATMOSPHERIC_VALVE), ATMOSPHERIC_VALVE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.AMBIENT_THERMAL_CONTROLLER), AMBIENT_THERMAL_CONTROLLER); - - // FOOD - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.MOON_CHEESE_CURD), MOON_CHEESE_CURD); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANNED_DEHYDRATED_APPLE), CANNED_DEHYDRATED_APPLE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANNED_DEHYDRATED_CARROT), CANNED_DEHYDRATED_CARROT); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANNED_DEHYDRATED_MELON), CANNED_DEHYDRATED_MELON); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANNED_DEHYDRATED_POTATO), CANNED_DEHYDRATED_POTATO); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CANNED_BEEF), CANNED_BEEF); - - // THROWABLE METEOR CHUNKS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THROWABLE_METEOR_CHUNK), THROWABLE_METEOR_CHUNK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HOT_THROWABLE_METEOR_CHUNK), HOT_THROWABLE_METEOR_CHUNK); - - // ARMOR - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_HELMET), HEAVY_DUTY_HELMET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_CHESTPLATE), HEAVY_DUTY_CHESTPLATE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_LEGGINGS), HEAVY_DUTY_LEGGINGS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_BOOTS), HEAVY_DUTY_BOOTS); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_HELMET), DESH_HELMET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_CHESTPLATE), DESH_CHESTPLATE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_LEGGINGS), DESH_LEGGINGS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_BOOTS), DESH_BOOTS); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_HELMET), TITANIUM_HELMET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_CHESTPLATE), TITANIUM_CHESTPLATE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_LEGGINGS), TITANIUM_LEGGINGS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_BOOTS), TITANIUM_BOOTS); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SENSOR_GLASSES), SENSOR_GLASSES); - - // TOOLS + WEAPONS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_SWORD), HEAVY_DUTY_SWORD); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_SHOVEL), HEAVY_DUTY_SHOVEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_PICKAXE), HEAVY_DUTY_PICKAXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_AXE), HEAVY_DUTY_AXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.HEAVY_DUTY_HOE), HEAVY_DUTY_HOE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_SWORD), DESH_SWORD); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_SHOVEL), DESH_SHOVEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_PICKAXE), DESH_PICKAXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_AXE), DESH_AXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.DESH_HOE), DESH_HOE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_SWORD), TITANIUM_SWORD); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_SHOVEL), TITANIUM_SHOVEL); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_PICKAXE), TITANIUM_PICKAXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_AXE), TITANIUM_AXE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANIUM_HOE), TITANIUM_HOE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.STANDARD_WRENCH), STANDARD_WRENCH); - - // SMITHING TEMPLATES - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TITANTIUM_UPGRADE_SMITHING_TEMPLATE), TITANTIUM_UPGRADE_SMITHING_TEMPLATE); - - // BATTERIES - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BATTERY), BATTERY); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.INFINITE_BATTERY), INFINITE_BATTERY); - - //FLUID BUCKETS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CRUDE_OIL_BUCKET), CRUDE_OIL_BUCKET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.FUEL_BUCKET), FUEL_BUCKET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SULFURIC_ACID_BUCKET), SULFURIC_ACID_BUCKET); - - //GALACTICRAFT INVENTORY - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.OXYGEN_MASK), OXYGEN_MASK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.OXYGEN_GEAR), OXYGEN_GEAR); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SMALL_OXYGEN_TANK), SMALL_OXYGEN_TANK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.MEDIUM_OXYGEN_TANK), MEDIUM_OXYGEN_TANK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.LARGE_OXYGEN_TANK), LARGE_OXYGEN_TANK); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.INFINITE_OXYGEN_TANK), INFINITE_OXYGEN_TANK); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.SHIELD_CONTROLLER), SHIELD_CONTROLLER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.FREQUENCY_MODULE), FREQUENCY_MODULE); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THERMAL_PADDING_HELMET), THERMAL_PADDING_HELMET); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THERMAL_PADDING_CHESTPIECE), THERMAL_PADDING_CHESTPIECE); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THERMAL_PADDING_LEGGINGS), THERMAL_PADDING_LEGGINGS); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.THERMAL_PADDING_BOOTS), THERMAL_PADDING_BOOTS); - - // SCHEMATICS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_ROCKET_CONE_SCHEMATIC), BASIC_ROCKET_CONE_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_ROCKET_BODY_SCHEMATIC), BASIC_ROCKET_BODY_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_ROCKET_FINS_SCHEMATIC), BASIC_ROCKET_FINS_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.BASIC_ROCKET_ENGINE_SCHEMATIC), BASIC_ROCKET_ENGINE_SCHEMATIC); - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TIER_2_ROCKET_SCHEMATIC), TIER_2_ROCKET_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.CARGO_ROCKET_SCHEMATIC), CARGO_ROCKET_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.MOON_BUGGY_SCHEMATIC), MOON_BUGGY_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.TIER_3_ROCKET_SCHEMATIC), TIER_3_ROCKET_SCHEMATIC); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Item.ASTRO_MINER_SCHEMATIC), ASTRO_MINER_SCHEMATIC); - - // SPAWN EGGS - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.MOON_VILLAGER), MOON_VILLAGER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_ZOMBIE), EVOLVED_ZOMBIE_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_CREEPER), EVOLVED_CREEPER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_SKELETON), EVOLVED_SKELETON_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_SPIDER), EVOLVED_SPIDER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_PILLAGER), EVOLVED_PILLAGER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_EVOKER), EVOLVED_EVOKER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.EVOLVED_VINDICATOR), EVOLVED_VINDICATOR_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.GAZER), GAZER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.RUMBLER), RUMBLER_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.COMET_CUBE), COMET_CUBE_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.OLI_GRUB), OLI_GRUB_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.GREY), GREY_SPAWN_EGG); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.SpawnEgg.ARCH_GREY), ARCH_GREY_SPAWN_EGG); - - - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.AIR_LOCK_FRAME), AIR_LOCK_FRAME); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.AIR_LOCK_CONTROLLER), AIR_LOCK_CONTROLLER); - Registry.register(BuiltInRegistries.ITEM, Constant.id(Constant.Block.AIR_LOCK_SEAL), AIR_LOCK_SEAL); - DispenserBlock.registerBehavior(FUEL_BUCKET, DispenserBlock.DISPENSER_REGISTRY.get(Items.WATER_BUCKET)); DispenserBlock.registerBehavior(CRUDE_OIL_BUCKET, DispenserBlock.DISPENSER_REGISTRY.get(Items.WATER_BUCKET)); DispenserBlock.registerBehavior(SULFURIC_ACID_BUCKET, DispenserBlock.DISPENSER_REGISTRY.get(Items.WATER_BUCKET)); diff --git a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java index 88752986e..56cdeb56f 100644 --- a/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java @@ -136,6 +136,7 @@ public void generateBlockStateModels(BlockModelGenerators generator) { // //todo: generate these generator.skipAutoItemBlock(GCBlocks.ALUMINUM_WIRE); generator.skipAutoItemBlock(GCBlocks.GLASS_FLUID_PIPE); + generator.skipAutoItemBlock(GCBlocks.MOON_CHEESE_WHEEL); // generator.delegateItemModel(GCBlocks.ALUMINUM_WIRE, ModelLocationUtils.getModelLocation(GCBlocks.ALUMINUM_WIRE, "_inventory")); // generator.delegateItemModel(GCBlocks.GLASS_FLUID_PIPE, ModelLocationUtils.getModelLocation(GCBlocks.GLASS_FLUID_PIPE, "_inventory")); @@ -445,7 +446,7 @@ private void createGlassFluidPipeAndWalkway(BlockModelGenerators generator) { GCModelTemplates.GLASS_FLUID_PIPE.create(Constant.id(color + "_" + BuiltInRegistries.BLOCK.getKey(GCBlocks.GLASS_FLUID_PIPE).getPath()).withPrefix("block/"), color(TextureMapping.getBlockTexture(GCBlocks.GLASS_FLUID_PIPE, "/" + color)), generator.modelOutput); GCModelTemplates.FLUID_PIPE_WALKWAY.create(Constant.id(color + "_" + BuiltInRegistries.BLOCK.getKey(GCBlocks.FLUID_PIPE_WALKWAY).getPath()).withPrefix("block/"), color(TextureMapping.getBlockTexture(GCBlocks.GLASS_FLUID_PIPE, "/" + color)), generator.modelOutput); } - generator.delegateItemModel(GCItems.FLUID_PIPE_WALKWAY, Constant.id("white_fluid_pipe_walkway").withPrefix("block/")); + generator.delegateItemModel(GCBlocks.FLUID_PIPE_WALKWAY, Constant.id("white_fluid_pipe_walkway").withPrefix("block/")); } private void createAutoGeneratedModel(BlockModelGenerators generator, Block block, ResourceLocation id) { @@ -689,7 +690,7 @@ private static TextureMapping detailedTexture(Block block) { private void createCheeseWheel(BlockModelGenerators generators) { var block = GCBlocks.MOON_CHEESE_WHEEL; - generators.createSimpleFlatItemModel(GCItems.MOON_CHEESE_WHEEL); + generators.createSimpleFlatItemModel(GCBlocks.MOON_CHEESE_WHEEL); generators.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block).with(PropertyDispatch.property(BlockStateProperties.BITES) .select(0, Variant.variant().with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(block))) .select(1, Variant.variant().with(VariantProperties.MODEL, ModelLocationUtils.getModelLocation(block, "_slice1"))) diff --git a/src/main/java/dev/galacticraft/mod/data/recipes/GCDecorationRecipeProvider.java b/src/main/java/dev/galacticraft/mod/data/recipes/GCDecorationRecipeProvider.java index 630067c67..fc2eb63c8 100644 --- a/src/main/java/dev/galacticraft/mod/data/recipes/GCDecorationRecipeProvider.java +++ b/src/main/java/dev/galacticraft/mod/data/recipes/GCDecorationRecipeProvider.java @@ -56,7 +56,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(Items.GLOWSTONE_DUST), has(Items.GLOWSTONE_DUST)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.GLOWSTONE_LANTERN) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.GLOWSTONE_LANTERN) .define('G', GCItems.GLOWSTONE_TORCH) .define('I', Items.IRON_NUGGET) .pattern("III") @@ -66,7 +66,7 @@ public void buildRecipes(RecipeOutput output) { .save(output); // Vacuum glass - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.VACUUM_GLASS) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.VACUUM_GLASS) .define('G', Items.GLASS) .define('T', GCItems.TIN_INGOT) .pattern("TGT") @@ -75,7 +75,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.TIN_INGOT), has(GCItems.TIN_INGOT)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.CLEAR_VACUUM_GLASS) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.CLEAR_VACUUM_GLASS) .define('G', Items.GLASS) .define('A', GCItems.ALUMINUM_INGOT) .pattern("AGA") @@ -84,7 +84,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.ALUMINUM_INGOT), has(GCItems.ALUMINUM_INGOT)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.STRONG_VACUUM_GLASS) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.STRONG_VACUUM_GLASS) .define('G', Items.GLASS) .define('A', GCItems.COMPRESSED_ALUMINUM) .pattern("AGA") @@ -94,7 +94,7 @@ public void buildRecipes(RecipeOutput output) { .save(output); // Light panels - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.DASHED_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.DASHED_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -103,7 +103,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.DIAGONAL_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.DIAGONAL_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -113,7 +113,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.DIAGONAL_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.DIAGONAL_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -121,9 +121,9 @@ public void buildRecipes(RecipeOutput output) { .pattern("SG") .pattern(" T") .unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL)) - .save(output, BuiltInRegistries.ITEM.getKey(GCItems.DIAGONAL_LIGHT_PANEL).withSuffix("_flipped")); + .save(output, BuiltInRegistries.ITEM.getKey(GCBlocks.DIAGONAL_LIGHT_PANEL.asItem()).withSuffix("_flipped")); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.SPOTLIGHT_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.SPOTLIGHT_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -133,7 +133,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.SQUARE_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.SQUARE_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -143,7 +143,7 @@ public void buildRecipes(RecipeOutput output) { .unlockedBy(getHasName(GCItems.COMPRESSED_STEEL), has(GCItems.COMPRESSED_STEEL)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCItems.LINEAR_LIGHT_PANEL) + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, GCBlocks.LINEAR_LIGHT_PANEL) .define('S', Items.GLASS_PANE) .define('G', GCItems.GLOWSTONE_TORCH) .define('T', GCItems.COMPRESSED_STEEL) @@ -154,14 +154,14 @@ public void buildRecipes(RecipeOutput output) { .save(output); // Misc decoration blocks - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, GCItems.IRON_GRATING, 4) + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, GCBlocks.IRON_GRATING, 4) .define('I', Items.IRON_BARS) .pattern("II") .pattern("II") .unlockedBy(getHasName(Items.IRON_BARS), has(Items.IRON_BARS)) .save(output); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, GCItems.TIN_LADDER, 6) + ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, GCBlocks.TIN_LADDER, 6) .define('T', GCItems.TIN_INGOT) .pattern("T T") .pattern("TTT") @@ -286,10 +286,10 @@ public void buildRecipes(RecipeOutput output) { ); // Rock decoration blocks - decorationBlockVariants(output, GCItems.MOON_ROCK, - GCItems.MOON_ROCK_SLAB, - GCItems.MOON_ROCK_STAIRS, - GCItems.MOON_ROCK_WALL + decorationBlockVariants(output, GCBlocks.MOON_ROCK, + GCBlocks.MOON_ROCK_SLAB, + GCBlocks.MOON_ROCK_STAIRS, + GCBlocks.MOON_ROCK_WALL ); decorationBlockVariants(output, GCBlocks.MOON_ROCK_BRICK, GCBlocks.MOON_ROCK_BRICK_SLAB, @@ -313,42 +313,42 @@ public void buildRecipes(RecipeOutput output) { chiseledStone(output, GCBlocks.CHISELED_MOON_ROCK_BRICK, GCBlocks.MOON_ROCK_BRICK_SLAB, GCBlocks.MOON_ROCK, GCBlocks.MOON_ROCK_BRICK); pillar(output, GCBlocks.MOON_ROCK_PILLAR, GCBlocks.MOON_ROCK); - decorationBlockVariants(output, GCItems.LUNASLATE, - GCItems.LUNASLATE_SLAB, - GCItems.LUNASLATE_STAIRS, - GCItems.LUNASLATE_WALL + decorationBlockVariants(output, GCBlocks.LUNASLATE, + GCBlocks.LUNASLATE_SLAB, + GCBlocks.LUNASLATE_STAIRS, + GCBlocks.LUNASLATE_WALL ); - decorationBlockVariants(output, GCItems.COBBLED_LUNASLATE, - GCItems.COBBLED_LUNASLATE_SLAB, - GCItems.COBBLED_LUNASLATE_STAIRS, - GCItems.COBBLED_LUNASLATE_WALL + decorationBlockVariants(output, GCBlocks.COBBLED_LUNASLATE, + GCBlocks.COBBLED_LUNASLATE_SLAB, + GCBlocks.COBBLED_LUNASLATE_STAIRS, + GCBlocks.COBBLED_LUNASLATE_WALL ); - decorationBlockVariants(output, GCItems.MOON_BASALT, - GCItems.MOON_BASALT_SLAB, - GCItems.MOON_BASALT_STAIRS, - GCItems.MOON_BASALT_WALL + decorationBlockVariants(output, GCBlocks.MOON_BASALT, + GCBlocks.MOON_BASALT_SLAB, + GCBlocks.MOON_BASALT_STAIRS, + GCBlocks.MOON_BASALT_WALL ); - decorationBlockVariants(output, GCItems.MOON_BASALT_BRICK, - GCItems.MOON_BASALT_BRICK_SLAB, - GCItems.MOON_BASALT_BRICK_STAIRS, - GCItems.MOON_BASALT_BRICK_WALL + decorationBlockVariants(output, GCBlocks.MOON_BASALT_BRICK, + GCBlocks.MOON_BASALT_BRICK_SLAB, + GCBlocks.MOON_BASALT_BRICK_STAIRS, + GCBlocks.MOON_BASALT_BRICK_WALL ); - decorationBlockVariants(output, GCItems.CRACKED_MOON_BASALT_BRICK, - GCItems.CRACKED_MOON_BASALT_BRICK_SLAB, - GCItems.CRACKED_MOON_BASALT_BRICK_STAIRS, - GCItems.CRACKED_MOON_BASALT_BRICK_WALL + decorationBlockVariants(output, GCBlocks.CRACKED_MOON_BASALT_BRICK, + GCBlocks.CRACKED_MOON_BASALT_BRICK_SLAB, + GCBlocks.CRACKED_MOON_BASALT_BRICK_STAIRS, + GCBlocks.CRACKED_MOON_BASALT_BRICK_WALL ); - decorationBlockVariants(output, GCItems.MARS_STONE, - GCItems.MARS_STONE_SLAB, - GCItems.MARS_STONE_STAIRS, - GCItems.MARS_STONE_WALL + decorationBlockVariants(output, GCBlocks.MARS_STONE, + GCBlocks.MARS_STONE_SLAB, + GCBlocks.MARS_STONE_STAIRS, + GCBlocks.MARS_STONE_WALL ); - decorationBlockVariants(output, GCItems.MARS_COBBLESTONE, - GCItems.MARS_COBBLESTONE_SLAB, - GCItems.MARS_COBBLESTONE_STAIRS, - GCItems.MARS_COBBLESTONE_WALL + decorationBlockVariants(output, GCBlocks.MARS_COBBLESTONE, + GCBlocks.MARS_COBBLESTONE_SLAB, + GCBlocks.MARS_COBBLESTONE_STAIRS, + GCBlocks.MARS_COBBLESTONE_WALL ); } diff --git a/src/main/java/dev/galacticraft/mod/data/recipes/GCMachineRecipes.java b/src/main/java/dev/galacticraft/mod/data/recipes/GCMachineRecipes.java index 77ed838e5..4b6482c69 100644 --- a/src/main/java/dev/galacticraft/mod/data/recipes/GCMachineRecipes.java +++ b/src/main/java/dev/galacticraft/mod/data/recipes/GCMachineRecipes.java @@ -49,11 +49,11 @@ public GCMachineRecipes(FabricDataOutput output, CompletableFuture Ingots nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_NUGGET, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, "meteoric_iron_ingot_from_nuggets", "meteoric_iron_ingot"); @@ -70,14 +70,14 @@ public void buildRecipes(RecipeOutput output) { nineBlockStoragePackingRecipe(output, RecipeCategory.MISC, GCItems.TITANIUM_NUGGET, RecipeCategory.MISC, GCItems.TITANIUM_INGOT, "titanium_ingot_from_nuggets", "titanium_ingot"); // Ingots <-> Blocks - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, RecipeCategory.BUILDING_BLOCKS, GCItems.METEORIC_IRON_BLOCK, "meteoric_iron_ingot_from_block", "meteoric_iron_ingot"); - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.DESH_INGOT, RecipeCategory.BUILDING_BLOCKS, GCItems.DESH_BLOCK, "desh_ingot_from_block", "desh_ingot"); - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_INGOT, RecipeCategory.BUILDING_BLOCKS, GCItems.LEAD_BLOCK, "lead_ingot_from_block", "lead_ingot"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.METEORIC_IRON_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.METEORIC_IRON_BLOCK, "meteoric_iron_ingot_from_block", "meteoric_iron_ingot"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.DESH_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.DESH_BLOCK, "desh_ingot_from_block", "desh_ingot"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LEAD_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LEAD_BLOCK, "lead_ingot_from_block", "lead_ingot"); nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.ALUMINUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.ALUMINUM_BLOCK, "aluminum_ingot_from_block", "aluminum_ingot"); nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TIN_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.TIN_BLOCK, "tin_ingot_from_block", "tin_ingot"); - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TITANIUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCItems.TITANIUM_BLOCK, "titanium_ingot_from_block", "titanium_ingot"); - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LUNAR_SAPPHIRE, RecipeCategory.BUILDING_BLOCKS, GCItems.LUNAR_SAPPHIRE_BLOCK, "lunar_sapphire_from_block", "lunar_sapphire"); - nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.SILICON, RecipeCategory.BUILDING_BLOCKS, GCItems.SILICON_BLOCK, "silicon_from_block", "silicon"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.TITANIUM_INGOT, RecipeCategory.BUILDING_BLOCKS, GCBlocks.TITANIUM_BLOCK, "titanium_ingot_from_block", "titanium_ingot"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.LUNAR_SAPPHIRE, RecipeCategory.BUILDING_BLOCKS, GCBlocks.LUNAR_SAPPHIRE_BLOCK, "lunar_sapphire_from_block", "lunar_sapphire"); + nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.SILICON, RecipeCategory.BUILDING_BLOCKS, GCBlocks.SILICON_BLOCK, "silicon_from_block", "silicon"); crystalBlockStorageRecipe(output, GCItems.OLIVINE_SHARD, RecipeCategory.MISC, GCBlocks.OLIVINE_BLOCK, "olivine_block_from_shards", null); nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_METEORIC_IRON, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_METEORIC_IRON_BLOCK, "raw_meteoric_iron_from_block", "raw_meteoric_iron"); nineBlockStorageUnpackingRecipe(output, RecipeCategory.MISC, GCItems.RAW_DESH, RecipeCategory.BUILDING_BLOCKS, GCBlocks.RAW_DESH_BLOCK, "raw_desh_from_block", "raw_desh"); diff --git a/src/main/java/dev/galacticraft/mod/data/recipes/GCRocketRecipes.java b/src/main/java/dev/galacticraft/mod/data/recipes/GCRocketRecipes.java index a5e1fdd12..14b409e64 100644 --- a/src/main/java/dev/galacticraft/mod/data/recipes/GCRocketRecipes.java +++ b/src/main/java/dev/galacticraft/mod/data/recipes/GCRocketRecipes.java @@ -22,6 +22,7 @@ package dev.galacticraft.mod.data.recipes; +import dev.galacticraft.mod.content.GCBlocks; import dev.galacticraft.mod.content.item.GCItems; import dev.galacticraft.mod.tag.GCTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -41,7 +42,7 @@ public GCRocketRecipes(FabricDataOutput output, CompletableFuture