diff --git a/core/src/main/java/mrtjp/projectred/core/BundledSignalsLib.java b/core/src/main/java/mrtjp/projectred/core/BundledSignalsLib.java index 66868f083..0614e46cd 100644 --- a/core/src/main/java/mrtjp/projectred/core/BundledSignalsLib.java +++ b/core/src/main/java/mrtjp/projectred/core/BundledSignalsLib.java @@ -40,8 +40,7 @@ public static void registerBundledTileInteraction(IBundledTileInteraction intera return ((IBundledTile) tile).getBundledSignal(side ^ 1); } - if (tile instanceof TileMultipart) { - TileMultipart tmp = (TileMultipart) tile; + if (tile instanceof TileMultipart tmp) { byte[] signal = null; // Source signal from all 4 perpendicular faces diff --git a/core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java b/core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java index c0c2f5d09..9d7199dcf 100644 --- a/core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java +++ b/core/src/main/java/mrtjp/projectred/core/ProjectRedCore.java @@ -36,18 +36,18 @@ public class ProjectRedCore { public static final Logger LOGGER = LogManager.getLogger(MOD_ID); public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); + public static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); + public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, MOD_ID); - public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); + public static final DeferredRegister> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); - public static final SimpleCreativeTab CORE_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(CoreReferences.RED_ALLOY_INGOT_ITEM)); + public static final SimpleCreativeTab CORE_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(CoreItems.RED_ALLOY_INGOT_ITEM.get())); static { CoreBlocks.register(); CoreItems.register(); - CoreContainers.register(); + CoreMenus.register(); CoreParts.register(); } @@ -61,9 +61,9 @@ public ProjectRedCore() { BLOCKS.register(modEventBus); ITEMS.register(modEventBus); - BLOCK_ENTITIES.register(modEventBus); - CONTAINERS.register(modEventBus); - PARTS.register(modEventBus); + BLOCK_ENTITY_TYPES.register(modEventBus); + MENU_TYPES.register(modEventBus); + PART_TYPES.register(modEventBus); } private void commonSetup(final FMLCommonSetupEvent event) { @@ -75,6 +75,7 @@ private void commonSetup(final FMLCommonSetupEvent event) { // Load compatibility modules if (Configurator.compat_CCBundledCable) { + //noinspection Convert2MethodRef OptionalMod.of("computercraft").ifPresent(mod -> ComputerCraftCompatibility.init(mod)); } } diff --git a/core/src/main/java/mrtjp/projectred/core/block/ElectrotineGeneratorBlock.java b/core/src/main/java/mrtjp/projectred/core/block/ElectrotineGeneratorBlock.java index 04e91d41f..b36a3f5e1 100644 --- a/core/src/main/java/mrtjp/projectred/core/block/ElectrotineGeneratorBlock.java +++ b/core/src/main/java/mrtjp/projectred/core/block/ElectrotineGeneratorBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.core.block; import codechicken.lib.vec.Rotation; -import mrtjp.projectred.core.init.CoreReferences; +import mrtjp.projectred.core.init.CoreBlocks; import mrtjp.projectred.core.tile.ElectrotineGeneratorTile; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; @@ -27,7 +27,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return CoreReferences.ELECTROTINE_GENERATOR_TILE; + return CoreBlocks.ELECTROTINE_GENERATOR_TILE.get(); } @Nullable diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreBlockStateModelProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreBlockStateModelProvider.java index 23da54360..b3ed8dc41 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreBlockStateModelProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreBlockStateModelProvider.java @@ -12,7 +12,7 @@ import javax.annotation.Nonnull; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_BLOCK; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; @SuppressWarnings("DataFlowIssue") public class CoreBlockStateModelProvider extends BlockStateProvider { @@ -29,7 +29,7 @@ public String getName() { @Override protected void registerStatesAndModels() { - quadStateFrontFacedPoweredMachineModel(ELECTROTINE_GENERATOR_BLOCK); + quadStateFrontFacedPoweredMachineModel(ELECTROTINE_GENERATOR_BLOCK.get()); } private void quadStateFrontFacedPoweredMachineModel(Block block) { diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreBlockTagsProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreBlockTagsProvider.java index fe2afa908..33a254c4f 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreBlockTagsProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreBlockTagsProvider.java @@ -7,8 +7,7 @@ import org.jetbrains.annotations.Nullable; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; - -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; public class CoreBlockTagsProvider extends BlockTagsProvider { @@ -25,7 +24,7 @@ public String getName() { protected void addTags() { tag(BlockTags.MINEABLE_WITH_PICKAXE) - .add(ELECTROTINE_GENERATOR_BLOCK); + .add(ELECTROTINE_GENERATOR_BLOCK.get()); } } diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java index 740412aff..578cbf784 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreItemModelProvider.java @@ -5,7 +5,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; +import static mrtjp.projectred.core.init.CoreItems.*; public class CoreItemModelProvider extends ItemModelProvider { @@ -20,7 +21,7 @@ public String getName() { @Override protected void registerModels() { - simpleItemBlock(ELECTROTINE_GENERATOR_BLOCK); + simpleItemBlock(ELECTROTINE_GENERATOR_BLOCK.get()); generated(PLATE_ITEM); generated(CONDUCTIVE_PLATE_ITEM); diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java index e9169401b..7ba0aef55 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreItemTagsProvider.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; import static mrtjp.projectred.core.init.CoreTags.*; public class CoreItemTagsProvider extends ItemTagsProvider { @@ -38,28 +38,28 @@ protected void addTags() { tag(Tags.Items.DUSTS) .addTag(ELECTROTINE_DUST_TAG); - tag(RED_ALLOY_INGOT_TAG).add(RED_ALLOY_INGOT_ITEM); - tag(ELECTROTINE_ALLOY_INGOT_TAG).add(ELECTROTINE_ALLOY_INGOT_ITEM); - tag(RUBY_GEM_TAG).add(RUBY_ITEM); - tag(SAPPHIRE_GEM_TAG).add(SAPPHIRE_ITEM); - tag(PERIDOT_GEM_TAG).add(PERIDOT_ITEM); - tag(ELECTROTINE_DUST_TAG).add(ELECTROTINE_DUST_ITEM); + tag(RED_ALLOY_INGOT_TAG).add(RED_ALLOY_INGOT_ITEM.get()); + tag(ELECTROTINE_ALLOY_INGOT_TAG).add(ELECTROTINE_ALLOY_INGOT_ITEM.get()); + tag(RUBY_GEM_TAG).add(RUBY_ITEM.get()); + tag(SAPPHIRE_GEM_TAG).add(SAPPHIRE_ITEM.get()); + tag(PERIDOT_GEM_TAG).add(PERIDOT_ITEM.get()); + tag(ELECTROTINE_DUST_TAG).add(ELECTROTINE_DUST_ITEM.get()); tag(ILLUMAR_TAG) - .add(WHITE_ILLUMAR_ITEM) - .add(ORANGE_ILLUMAR_ITEM) - .add(MAGENTA_ILLUMAR_ITEM) - .add(LIGHT_BLUE_ILLUMAR_ITEM) - .add(YELLOW_ILLUMAR_ITEM) - .add(LIME_ILLUMAR_ITEM) - .add(PINK_ILLUMAR_ITEM) - .add(GRAY_ILLUMAR_ITEM) - .add(LIGHT_GRAY_ILLUMAR_ITEM) - .add(CYAN_ILLUMAR_ITEM) - .add(PURPLE_ILLUMAR_ITEM) - .add(BLUE_ILLUMAR_ITEM) - .add(BROWN_ILLUMAR_ITEM) - .add(GREEN_ILLUMAR_ITEM) - .add(RED_ILLUMAR_ITEM) - .add(BLACK_ILLUMAR_ITEM); + .add(WHITE_ILLUMAR_ITEM.get()) + .add(ORANGE_ILLUMAR_ITEM.get()) + .add(MAGENTA_ILLUMAR_ITEM.get()) + .add(LIGHT_BLUE_ILLUMAR_ITEM.get()) + .add(YELLOW_ILLUMAR_ITEM.get()) + .add(LIME_ILLUMAR_ITEM.get()) + .add(PINK_ILLUMAR_ITEM.get()) + .add(GRAY_ILLUMAR_ITEM.get()) + .add(LIGHT_GRAY_ILLUMAR_ITEM.get()) + .add(CYAN_ILLUMAR_ITEM.get()) + .add(PURPLE_ILLUMAR_ITEM.get()) + .add(BLUE_ILLUMAR_ITEM.get()) + .add(BROWN_ILLUMAR_ITEM.get()) + .add(GREEN_ILLUMAR_ITEM.get()) + .add(RED_ILLUMAR_ITEM.get()) + .add(BLACK_ILLUMAR_ITEM.get()); } } diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java index 994a49a81..bb8b0c7fa 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreLanguageProvider.java @@ -4,7 +4,8 @@ import net.minecraftforge.common.data.LanguageProvider; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; +import static mrtjp.projectred.core.init.CoreItems.*; public class CoreLanguageProvider extends LanguageProvider { @@ -24,60 +25,60 @@ protected void addTranslations() { add("itemGroup." + MOD_ID, "Project Red: Core"); // Blocks - add(ELECTROTINE_GENERATOR_BLOCK, "Electrotine Generator"); + add(ELECTROTINE_GENERATOR_BLOCK.get(), "Electrotine Generator"); // Items - add(PLATE_ITEM, "Circuit Plate"); - add(CONDUCTIVE_PLATE_ITEM, "Conductive Plate"); - add(WIRED_PLATE_ITEM, "Wired Plate"); - add(BUNDLED_PLATE_ITEM, "Bundled Plate"); - add(PLATFORMED_PLATE_ITEM, "Platformed Plate"); - add(ANODE_ITEM, "Anode"); - add(CATHODE_ITEM, "Cathode"); - add(POINTER_ITEM, "Pointer"); - add(SILICON_CHIP_ITEM, "Silicon Chip"); - add(ENERGIZED_SILICON_CHIP_ITEM, "Energized Silicon Chip"); - add(RED_ALLOY_INGOT_ITEM, "Red Alloy Ingot"); - add(ELECTROTINE_ALLOY_INGOT_ITEM, "Electrotine Alloy Ingot"); - add(ELECTROTINE_DUST_ITEM, "Electrotine Dust"); - add(RUBY_ITEM, "Ruby"); - add(SAPPHIRE_ITEM, "Sapphire"); - add(PERIDOT_ITEM, "Peridot"); - add(SAND_COAL_COMP_ITEM, "Sand Coal Compound"); - add(RED_IRON_COMP_ITEM, "Red Iron Compound"); - add(ELECTROTINE_IRON_COMP_ITEM, "Electrotine Iron Compound"); - add(SILICON_BOULE_ITEM, "Silicon Boule"); - add(SILICON_ITEM, "Silicon"); - add(RED_SILICON_COMP_ITEM, "Red Silicon Compound"); - add(GLOW_SILICON_COMP_ITEM, "Glowing Silicon Compound"); - add(ELECTROTINE_SILICON_COMP_ITEM, "Electrotine Silicon Compound"); - add(INFUSED_SILICON_ITEM, "Infused Silicon"); - add(ENERGIZED_SILICON_ITEM, "Energized Silicon"); - add(ELECTROTINE_SILICON_ITEM, "Electrotine Silicon"); - add(COPPER_COIL_ITEM, "Copper Coil"); - add(IRON_COIL_ITEM, "Iron Coil"); - add(GOLD_COIL_ITEM, "Gold Coil"); - add(MOTOR_ITEM, "Motor"); - add(WOVEN_CLOTH_ITEM, "Woven Cloth"); - add(SAIL_ITEM, "Sail"); - add(WHITE_ILLUMAR_ITEM, "White Illumar"); - add(ORANGE_ILLUMAR_ITEM, "Orange Illumar"); - add(MAGENTA_ILLUMAR_ITEM, "Magenta Illumar"); - add(LIGHT_BLUE_ILLUMAR_ITEM, "Light Blue Illumar"); - add(YELLOW_ILLUMAR_ITEM, "Yellow Illumar"); - add(LIME_ILLUMAR_ITEM, "Lime Illumar"); - add(PINK_ILLUMAR_ITEM, "Pink Illumar"); - add(GRAY_ILLUMAR_ITEM, "Gray Illumar"); - add(LIGHT_GRAY_ILLUMAR_ITEM, "Light Gray Illumar"); - add(CYAN_ILLUMAR_ITEM, "Cyan Illumar"); - add(PURPLE_ILLUMAR_ITEM, "Purple Illumar"); - add(BLUE_ILLUMAR_ITEM, "Blue Illumar"); - add(BROWN_ILLUMAR_ITEM, "Brown Illumar"); - add(GREEN_ILLUMAR_ITEM, "Green Illumar"); - add(RED_ILLUMAR_ITEM, "Red Illumar"); - add(BLACK_ILLUMAR_ITEM, "Black Illumar"); - add(DRAW_PLATE_ITEM, "Draw Plate"); - add(SCREWDRIVER_ITEM, "Screwdriver"); - add(MULTIMETER_ITEM, "Multimeter"); + add(PLATE_ITEM.get(), "Circuit Plate"); + add(CONDUCTIVE_PLATE_ITEM.get(), "Conductive Plate"); + add(WIRED_PLATE_ITEM.get(), "Wired Plate"); + add(BUNDLED_PLATE_ITEM.get(), "Bundled Plate"); + add(PLATFORMED_PLATE_ITEM.get(), "Platformed Plate"); + add(ANODE_ITEM.get(), "Anode"); + add(CATHODE_ITEM.get(), "Cathode"); + add(POINTER_ITEM.get(), "Pointer"); + add(SILICON_CHIP_ITEM.get(), "Silicon Chip"); + add(ENERGIZED_SILICON_CHIP_ITEM.get(), "Energized Silicon Chip"); + add(RED_ALLOY_INGOT_ITEM.get(), "Red Alloy Ingot"); + add(ELECTROTINE_ALLOY_INGOT_ITEM.get(), "Electrotine Alloy Ingot"); + add(ELECTROTINE_DUST_ITEM.get(), "Electrotine Dust"); + add(RUBY_ITEM.get(), "Ruby"); + add(SAPPHIRE_ITEM.get(), "Sapphire"); + add(PERIDOT_ITEM.get(), "Peridot"); + add(SAND_COAL_COMP_ITEM.get(), "Sand Coal Compound"); + add(RED_IRON_COMP_ITEM.get(), "Red Iron Compound"); + add(ELECTROTINE_IRON_COMP_ITEM.get(), "Electrotine Iron Compound"); + add(SILICON_BOULE_ITEM.get(), "Silicon Boule"); + add(SILICON_ITEM.get(), "Silicon"); + add(RED_SILICON_COMP_ITEM.get(), "Red Silicon Compound"); + add(GLOW_SILICON_COMP_ITEM.get(), "Glowing Silicon Compound"); + add(ELECTROTINE_SILICON_COMP_ITEM.get(), "Electrotine Silicon Compound"); + add(INFUSED_SILICON_ITEM.get(), "Infused Silicon"); + add(ENERGIZED_SILICON_ITEM.get(), "Energized Silicon"); + add(ELECTROTINE_SILICON_ITEM.get(), "Electrotine Silicon"); + add(COPPER_COIL_ITEM.get(), "Copper Coil"); + add(IRON_COIL_ITEM.get(), "Iron Coil"); + add(GOLD_COIL_ITEM.get(), "Gold Coil"); + add(MOTOR_ITEM.get(), "Motor"); + add(WOVEN_CLOTH_ITEM.get(), "Woven Cloth"); + add(SAIL_ITEM.get(), "Sail"); + add(WHITE_ILLUMAR_ITEM.get(), "White Illumar"); + add(ORANGE_ILLUMAR_ITEM.get(), "Orange Illumar"); + add(MAGENTA_ILLUMAR_ITEM.get(), "Magenta Illumar"); + add(LIGHT_BLUE_ILLUMAR_ITEM.get(), "Light Blue Illumar"); + add(YELLOW_ILLUMAR_ITEM.get(), "Yellow Illumar"); + add(LIME_ILLUMAR_ITEM.get(), "Lime Illumar"); + add(PINK_ILLUMAR_ITEM.get(), "Pink Illumar"); + add(GRAY_ILLUMAR_ITEM.get(), "Gray Illumar"); + add(LIGHT_GRAY_ILLUMAR_ITEM.get(), "Light Gray Illumar"); + add(CYAN_ILLUMAR_ITEM.get(), "Cyan Illumar"); + add(PURPLE_ILLUMAR_ITEM.get(), "Purple Illumar"); + add(BLUE_ILLUMAR_ITEM.get(), "Blue Illumar"); + add(BROWN_ILLUMAR_ITEM.get(), "Brown Illumar"); + add(GREEN_ILLUMAR_ITEM.get(), "Green Illumar"); + add(RED_ILLUMAR_ITEM.get(), "Red Illumar"); + add(BLACK_ILLUMAR_ITEM.get(), "Black Illumar"); + add(DRAW_PLATE_ITEM.get(), "Draw Plate"); + add(SCREWDRIVER_ITEM.get(), "Screwdriver"); + add(MULTIMETER_ITEM.get(), "Multimeter"); } } diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreLootTableProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreLootTableProvider.java index 2d44d11d5..fe2bf6e54 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreLootTableProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreLootTableProvider.java @@ -3,7 +3,7 @@ import codechicken.lib.datagen.LootTableProvider; import net.minecraft.data.DataGenerator; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_BLOCK; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; public class CoreLootTableProvider extends LootTableProvider.BlockLootProvider { @@ -18,6 +18,6 @@ public String getName() { @Override protected void registerTables() { - register(ELECTROTINE_GENERATOR_BLOCK, singleItem(ELECTROTINE_GENERATOR_BLOCK)); + register(ELECTROTINE_GENERATOR_BLOCK.get(), singleItem(ELECTROTINE_GENERATOR_BLOCK.get())); } } diff --git a/core/src/main/java/mrtjp/projectred/core/data/CoreRecipeProvider.java b/core/src/main/java/mrtjp/projectred/core/data/CoreRecipeProvider.java index e4a1c17df..abfce0559 100644 --- a/core/src/main/java/mrtjp/projectred/core/data/CoreRecipeProvider.java +++ b/core/src/main/java/mrtjp/projectred/core/data/CoreRecipeProvider.java @@ -9,36 +9,17 @@ import net.minecraft.data.DataGenerator; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.crafting.NBTIngredient; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_BLOCK; +import static mrtjp.projectred.core.init.CoreItems.*; import static mrtjp.projectred.core.init.CoreTags.*; import static net.minecraftforge.common.Tags.Items.*; public class CoreRecipeProvider extends RecipeProvider { - private static final Item[] ILLUMAR_ITEMS = { - WHITE_ILLUMAR_ITEM, - ORANGE_ILLUMAR_ITEM, - MAGENTA_ILLUMAR_ITEM, - LIGHT_BLUE_ILLUMAR_ITEM, - YELLOW_ILLUMAR_ITEM, - LIME_ILLUMAR_ITEM, - PINK_ILLUMAR_ITEM, - GRAY_ILLUMAR_ITEM, - LIGHT_GRAY_ILLUMAR_ITEM, - CYAN_ILLUMAR_ITEM, - PURPLE_ILLUMAR_ITEM, - BLUE_ILLUMAR_ITEM, - BROWN_ILLUMAR_ITEM, - GREEN_ILLUMAR_ITEM, - RED_ILLUMAR_ITEM, - BLACK_ILLUMAR_ITEM, - }; - public CoreRecipeProvider(DataGenerator gen) { super(gen); } @@ -51,7 +32,7 @@ public String getName() { @Override protected void registerRecipes() { - shapedRecipe(ELECTROTINE_GENERATOR_BLOCK) + shapedRecipe(ELECTROTINE_GENERATOR_BLOCK.get()) .patternLine("bbb") .patternLine("bdb") .patternLine("cec") @@ -60,178 +41,178 @@ protected void registerRecipes() { .key('c', Blocks.CLAY) .key('e', ELECTROTINE_ALLOY_INGOT_TAG); - smelting(PLATE_ITEM, 2) + smelting(PLATE_ITEM.get(), 2) .ingredient(Blocks.SMOOTH_STONE); - smelting(SILICON_BOULE_ITEM) - .ingredient(SAND_COAL_COMP_ITEM); + smelting(SILICON_BOULE_ITEM.get()) + .ingredient(SAND_COAL_COMP_ITEM.get()); - smelting(INFUSED_SILICON_ITEM) - .ingredient(RED_SILICON_COMP_ITEM); + smelting(INFUSED_SILICON_ITEM.get()) + .ingredient(RED_SILICON_COMP_ITEM.get()); - smelting(ENERGIZED_SILICON_ITEM) - .ingredient(GLOW_SILICON_COMP_ITEM); + smelting(ENERGIZED_SILICON_ITEM.get()) + .ingredient(GLOW_SILICON_COMP_ITEM.get()); - smelting(RED_ALLOY_INGOT_ITEM) - .ingredient(RED_IRON_COMP_ITEM); + smelting(RED_ALLOY_INGOT_ITEM.get()) + .ingredient(RED_IRON_COMP_ITEM.get()); - smelting(ELECTROTINE_ALLOY_INGOT_ITEM) - .ingredient(ELECTROTINE_IRON_COMP_ITEM); + smelting(ELECTROTINE_ALLOY_INGOT_ITEM.get()) + .ingredient(ELECTROTINE_IRON_COMP_ITEM.get()); - smelting(ELECTROTINE_SILICON_ITEM) - .ingredient(ELECTROTINE_SILICON_COMP_ITEM); + smelting(ELECTROTINE_SILICON_ITEM.get()) + .ingredient(ELECTROTINE_SILICON_COMP_ITEM.get()); - shapedRecipe(CONDUCTIVE_PLATE_ITEM) + shapedRecipe(CONDUCTIVE_PLATE_ITEM.get()) .key('R', DUSTS_REDSTONE) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine("R") .patternLine("P"); - shapedRecipe(PLATFORMED_PLATE_ITEM) - .key('R', CONDUCTIVE_PLATE_ITEM) + shapedRecipe(PLATFORMED_PLATE_ITEM.get()) + .key('R', CONDUCTIVE_PLATE_ITEM.get()) .key('S', RODS_WOODEN) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine(" R ") .patternLine("SPS") .patternLine("PRP"); - shapedRecipe(ANODE_ITEM, 3) + shapedRecipe(ANODE_ITEM.get(), 3) .key('R', DUSTS_REDSTONE) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine(" R ") .patternLine("RRR") .patternLine("PPP"); - shapedRecipe(CATHODE_ITEM) + shapedRecipe(CATHODE_ITEM.get()) .key('T', Items.REDSTONE_TORCH) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine("T") .patternLine("P"); - shapedRecipe(POINTER_ITEM) + shapedRecipe(POINTER_ITEM.get()) .key('S', STONE) .key('T', Items.REDSTONE_TORCH) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine("S") .patternLine("T") .patternLine("P"); - shapedRecipe(SILICON_CHIP_ITEM) - .key('S', INFUSED_SILICON_ITEM) - .key('P', PLATE_ITEM) + shapedRecipe(SILICON_CHIP_ITEM.get()) + .key('S', INFUSED_SILICON_ITEM.get()) + .key('P', PLATE_ITEM.get()) .patternLine(" S ") .patternLine("PPP"); - shapedRecipe(ENERGIZED_SILICON_CHIP_ITEM) - .key('E', ENERGIZED_SILICON_ITEM) - .key('P', PLATE_ITEM) + shapedRecipe(ENERGIZED_SILICON_CHIP_ITEM.get()) + .key('E', ENERGIZED_SILICON_ITEM.get()) + .key('P', PLATE_ITEM.get()) .patternLine(" E ") .patternLine("PPP"); - shapedRecipe(SAND_COAL_COMP_ITEM) + shapedRecipe(SAND_COAL_COMP_ITEM.get()) .key('S', SAND) .key('C', STORAGE_BLOCKS_COAL) .patternLine("SSS") .patternLine("SCS") .patternLine("SSS"); - shapedRecipe(RED_IRON_COMP_ITEM) + shapedRecipe(RED_IRON_COMP_ITEM.get()) .key('R', DUSTS_REDSTONE) .key('I', INGOTS_IRON) .patternLine("RRR") .patternLine("RIR") .patternLine("RRR"); - shapedRecipe(ELECTROTINE_IRON_COMP_ITEM) + shapedRecipe(ELECTROTINE_IRON_COMP_ITEM.get()) .key('B', ELECTROTINE_DUST_TAG) .key('I', INGOTS_IRON) .patternLine("BBB") .patternLine("BIB") .patternLine("BBB"); - shapedRecipe(SILICON_ITEM, 8) + shapedRecipe(SILICON_ITEM.get(), 8) .key('S', CBMicroblockModContent.DIAMOND_SAW.get()) - .key('B', SILICON_BOULE_ITEM) + .key('B', SILICON_BOULE_ITEM.get()) .patternLine("S") .patternLine("B"); - shapedRecipe(RED_SILICON_COMP_ITEM) + shapedRecipe(RED_SILICON_COMP_ITEM.get()) .key('R', DUSTS_REDSTONE) - .key('S', SILICON_ITEM) + .key('S', SILICON_ITEM.get()) .patternLine("RRR") .patternLine("RSR") .patternLine("RRR"); - shapedRecipe(GLOW_SILICON_COMP_ITEM) + shapedRecipe(GLOW_SILICON_COMP_ITEM.get()) .key('G', DUSTS_GLOWSTONE) - .key('S', SILICON_ITEM) + .key('S', SILICON_ITEM.get()) .patternLine("GGG") .patternLine("GSG") .patternLine("GGG"); - shapedRecipe(ELECTROTINE_SILICON_COMP_ITEM) + shapedRecipe(ELECTROTINE_SILICON_COMP_ITEM.get()) .key('E', ELECTROTINE_DUST_TAG) - .key('S', SILICON_ITEM) + .key('S', SILICON_ITEM.get()) .patternLine("EEE") .patternLine("ESE") .patternLine("EEE"); - shapedRecipe(COPPER_COIL_ITEM) + shapedRecipe(COPPER_COIL_ITEM.get()) .key('C', INGOTS_COPPER) - .key('D', DRAW_PLATE_ITEM) + .key('D', DRAW_PLATE_ITEM.get()) .patternLine("CD"); - shapedRecipe(IRON_COIL_ITEM) + shapedRecipe(IRON_COIL_ITEM.get()) .key('I', INGOTS_IRON) - .key('D', DRAW_PLATE_ITEM) + .key('D', DRAW_PLATE_ITEM.get()) .patternLine("ID"); - shapedRecipe(GOLD_COIL_ITEM) + shapedRecipe(GOLD_COIL_ITEM.get()) .key('G', INGOTS_GOLD) - .key('D', DRAW_PLATE_ITEM) + .key('D', DRAW_PLATE_ITEM.get()) .patternLine("GD"); - shapedRecipe(MOTOR_ITEM) + shapedRecipe(MOTOR_ITEM.get()) .key('I', INGOTS_IRON) .key('S', STONE) - .key('C', COPPER_COIL_ITEM) + .key('C', COPPER_COIL_ITEM.get()) .key('R', DUSTS_REDSTONE) .patternLine(" I ") .patternLine("SCS") .patternLine("RCR"); - shapedRecipe(WOVEN_CLOTH_ITEM) + shapedRecipe(WOVEN_CLOTH_ITEM.get()) .key('S', STRING) .key('W', RODS_WOODEN) .patternLine("SSS") .patternLine("SWS") .patternLine("SSS"); - shapedRecipe(SAIL_ITEM) - .key('S', WOVEN_CLOTH_ITEM) + shapedRecipe(SAIL_ITEM.get()) + .key('S', WOVEN_CLOTH_ITEM.get()) .patternLine("SS") .patternLine("SS") .patternLine("SS"); for (int i = 0; i < 16; i++) { - addIllumarRecipe(ILLUMAR_ITEMS[i], EnumColour.values()[i]); + addIllumarRecipe(getIllumarByIndex(i), EnumColour.values()[i]); } - shapedRecipe(DRAW_PLATE_ITEM) - .key('I', new PublicNBTIngredient(ItemMicroBlock.create(3, 2, MicroMaterialRegistry.getMaterial(BlockMicroMaterial.makeMaterialKey(Blocks.IRON_BLOCK.defaultBlockState()))))) - .key('D', new PublicNBTIngredient(ItemMicroBlock.create(0, 2, MicroMaterialRegistry.getMaterial(BlockMicroMaterial.makeMaterialKey(Blocks.DIAMOND_BLOCK.defaultBlockState()))))) + shapedRecipe(DRAW_PLATE_ITEM.get()) + .key('I', NBTIngredient.of(ItemMicroBlock.create(3, 2, MicroMaterialRegistry.getMaterial(BlockMicroMaterial.makeMaterialKey(Blocks.IRON_BLOCK.defaultBlockState()))))) + .key('D', NBTIngredient.of(ItemMicroBlock.create(0, 2, MicroMaterialRegistry.getMaterial(BlockMicroMaterial.makeMaterialKey(Blocks.DIAMOND_BLOCK.defaultBlockState()))))) .patternLine(" I ") .patternLine("IDI") .patternLine(" I "); - shapedRecipe(SCREWDRIVER_ITEM) + shapedRecipe(SCREWDRIVER_ITEM.get()) .key('I', INGOTS_IRON) .key('B', DYES_BLUE) .patternLine("I ") .patternLine(" IB") .patternLine(" BI"); - shapedRecipe(MULTIMETER_ITEM) + shapedRecipe(MULTIMETER_ITEM.get()) .key('A', RED_ALLOY_INGOT_TAG) .key('B', DYES_BLACK) .key('E', DYES_GREEN) @@ -248,11 +229,4 @@ private void addIllumarRecipe(Item illumarItem, EnumColour color) { .addIngredient(ItemTags.create(color.getDyeTagName()), 2); } - // Forge PLS :( - private static class PublicNBTIngredient extends NBTIngredient { - public PublicNBTIngredient(ItemStack stack) { - super(stack); - } - } - } diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreBlocks.java b/core/src/main/java/mrtjp/projectred/core/init/CoreBlocks.java index 441fc0116..7b17e56ee 100644 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreBlocks.java +++ b/core/src/main/java/mrtjp/projectred/core/init/CoreBlocks.java @@ -4,25 +4,33 @@ import mrtjp.projectred.core.tile.ElectrotineGeneratorTile; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.core.ProjectRedCore.*; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_BLOCK; -@SuppressWarnings("DataFlowIssue") +@SuppressWarnings({ "DataFlowIssue", "NotNullFieldNotInitialized" }) public class CoreBlocks { public static final String ID_ELECTROTINE_GENERATOR = "electrotine_generator"; + // Blocks + public static RegistryObject ELECTROTINE_GENERATOR_BLOCK; + + // Tile + public static RegistryObject> ELECTROTINE_GENERATOR_TILE; + + public static void register() { // Blocks - BLOCKS.register(ID_ELECTROTINE_GENERATOR, ElectrotineGeneratorBlock::new); + ELECTROTINE_GENERATOR_BLOCK = BLOCKS.register(ID_ELECTROTINE_GENERATOR, ElectrotineGeneratorBlock::new); // Block Items - ITEMS.register(ID_ELECTROTINE_GENERATOR, () -> new BlockItem(ELECTROTINE_GENERATOR_BLOCK, new Item.Properties().tab(CORE_CREATIVE_TAB))); + ITEMS.register(ID_ELECTROTINE_GENERATOR, () -> new BlockItem(ELECTROTINE_GENERATOR_BLOCK.get(), new Item.Properties().tab(CORE_CREATIVE_TAB))); // Tiles - BLOCK_ENTITIES.register(ID_ELECTROTINE_GENERATOR, () -> BlockEntityType.Builder.of(ElectrotineGeneratorTile::new, ELECTROTINE_GENERATOR_BLOCK).build(null)); + ELECTROTINE_GENERATOR_TILE = BLOCK_ENTITY_TYPES.register(ID_ELECTROTINE_GENERATOR, () -> BlockEntityType.Builder.of(ElectrotineGeneratorTile::new, ELECTROTINE_GENERATOR_BLOCK.get()).build(null)); } } diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreClientInit.java b/core/src/main/java/mrtjp/projectred/core/init/CoreClientInit.java index f6c0589d2..6f72cab7d 100644 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreClientInit.java +++ b/core/src/main/java/mrtjp/projectred/core/init/CoreClientInit.java @@ -14,7 +14,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_CONTAINER; +import static mrtjp.projectred.core.init.CoreMenus.ELECTROTINE_GENERATOR_CONTAINER; @SuppressWarnings("NotNullFieldNotInitialized") public class CoreClientInit { @@ -31,7 +31,7 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { // Register screens - MenuScreens.register(ELECTROTINE_GENERATOR_CONTAINER, ElectrotineGeneratorScreen::new); + MenuScreens.register(ELECTROTINE_GENERATOR_CONTAINER.get(), ElectrotineGeneratorScreen::new); // Init Halo Renderer HaloRenderer.init(); diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreContainers.java b/core/src/main/java/mrtjp/projectred/core/init/CoreContainers.java deleted file mode 100644 index 730cf9075..000000000 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreContainers.java +++ /dev/null @@ -1,15 +0,0 @@ -package mrtjp.projectred.core.init; - -import codechicken.lib.inventory.container.ICCLContainerType; -import mrtjp.projectred.core.inventory.container.ElectrotineGeneratorContainer; - -import static mrtjp.projectred.core.ProjectRedCore.CONTAINERS; -import static mrtjp.projectred.core.init.CoreBlocks.ID_ELECTROTINE_GENERATOR; - -public class CoreContainers { - - public static void register() { - - CONTAINERS.register(ID_ELECTROTINE_GENERATOR, () -> ICCLContainerType.create(ElectrotineGeneratorContainer.FACTORY)); - } -} diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreItems.java b/core/src/main/java/mrtjp/projectred/core/init/CoreItems.java index 7ab73059e..8c60adf32 100644 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreItems.java +++ b/core/src/main/java/mrtjp/projectred/core/init/CoreItems.java @@ -4,12 +4,14 @@ import mrtjp.projectred.core.item.MultimeterItem; import mrtjp.projectred.core.item.ScrewdriverItem; import net.minecraft.world.item.Item; +import net.minecraftforge.registries.RegistryObject; import java.util.function.Supplier; import static mrtjp.projectred.core.ProjectRedCore.CORE_CREATIVE_TAB; import static mrtjp.projectred.core.ProjectRedCore.ITEMS; +@SuppressWarnings("NotNullFieldNotInitialized") public class CoreItems { public static final String ID_PLATE = "plate"; @@ -66,68 +68,154 @@ public class CoreItems { public static final String ID_SCREWDRIVER = "screwdriver"; public static final String ID_MULTIMETER = "multimeter"; + // Ingots / dusts / gems + public static RegistryObject RED_ALLOY_INGOT_ITEM; + public static RegistryObject ELECTROTINE_ALLOY_INGOT_ITEM; + public static RegistryObject ELECTROTINE_DUST_ITEM; + public static RegistryObject RUBY_ITEM; + public static RegistryObject SAPPHIRE_ITEM; + public static RegistryObject PERIDOT_ITEM; + + // Recipe ingredients + public static RegistryObject PLATE_ITEM; + public static RegistryObject CONDUCTIVE_PLATE_ITEM; + public static RegistryObject WIRED_PLATE_ITEM; + public static RegistryObject BUNDLED_PLATE_ITEM; + public static RegistryObject PLATFORMED_PLATE_ITEM; + public static RegistryObject ANODE_ITEM; + public static RegistryObject CATHODE_ITEM; + public static RegistryObject POINTER_ITEM; + public static RegistryObject SILICON_CHIP_ITEM; + public static RegistryObject ENERGIZED_SILICON_CHIP_ITEM; + public static RegistryObject SAND_COAL_COMP_ITEM; + public static RegistryObject RED_IRON_COMP_ITEM; + public static RegistryObject ELECTROTINE_IRON_COMP_ITEM; + public static RegistryObject SILICON_BOULE_ITEM; + public static RegistryObject SILICON_ITEM; + public static RegistryObject RED_SILICON_COMP_ITEM; + public static RegistryObject GLOW_SILICON_COMP_ITEM; + public static RegistryObject ELECTROTINE_SILICON_COMP_ITEM; + public static RegistryObject INFUSED_SILICON_ITEM; + public static RegistryObject ENERGIZED_SILICON_ITEM; + public static RegistryObject ELECTROTINE_SILICON_ITEM; + public static RegistryObject COPPER_COIL_ITEM; + public static RegistryObject IRON_COIL_ITEM; + public static RegistryObject GOLD_COIL_ITEM; + public static RegistryObject MOTOR_ITEM; + public static RegistryObject WOVEN_CLOTH_ITEM; + public static RegistryObject SAIL_ITEM; + + // Illumars + public static RegistryObject WHITE_ILLUMAR_ITEM; + public static RegistryObject ORANGE_ILLUMAR_ITEM; + public static RegistryObject MAGENTA_ILLUMAR_ITEM; + public static RegistryObject LIGHT_BLUE_ILLUMAR_ITEM; + public static RegistryObject YELLOW_ILLUMAR_ITEM; + public static RegistryObject LIME_ILLUMAR_ITEM; + public static RegistryObject PINK_ILLUMAR_ITEM; + public static RegistryObject GRAY_ILLUMAR_ITEM; + public static RegistryObject LIGHT_GRAY_ILLUMAR_ITEM; + public static RegistryObject CYAN_ILLUMAR_ITEM; + public static RegistryObject PURPLE_ILLUMAR_ITEM; + public static RegistryObject BLUE_ILLUMAR_ITEM; + public static RegistryObject BROWN_ILLUMAR_ITEM; + public static RegistryObject GREEN_ILLUMAR_ITEM; + public static RegistryObject RED_ILLUMAR_ITEM; + public static RegistryObject BLACK_ILLUMAR_ITEM; + + // Tools + public static RegistryObject DRAW_PLATE_ITEM; + public static RegistryObject SCREWDRIVER_ITEM; + public static RegistryObject MULTIMETER_ITEM; + public static void register() { // Ingots/dusts/gems - ITEMS.register(ID_RED_ALLOY_INGOT, createSimpleItemSupplier()); - ITEMS.register(ID_ELECTROTINE_ALLOY_INGOT, createSimpleItemSupplier()); - ITEMS.register(ID_ELECTROTINE_DUST, createSimpleItemSupplier()); - ITEMS.register(ID_RUBY, createSimpleItemSupplier()); - ITEMS.register(ID_SAPPHIRE, createSimpleItemSupplier()); - ITEMS.register(ID_PERIDOT, createSimpleItemSupplier()); + RED_ALLOY_INGOT_ITEM = ITEMS.register(ID_RED_ALLOY_INGOT, createSimpleItemSupplier()); + ELECTROTINE_ALLOY_INGOT_ITEM = ITEMS.register(ID_ELECTROTINE_ALLOY_INGOT, createSimpleItemSupplier()); + ELECTROTINE_DUST_ITEM = ITEMS.register(ID_ELECTROTINE_DUST, createSimpleItemSupplier()); + RUBY_ITEM = ITEMS.register(ID_RUBY, createSimpleItemSupplier()); + SAPPHIRE_ITEM = ITEMS.register(ID_SAPPHIRE, createSimpleItemSupplier()); + PERIDOT_ITEM = ITEMS.register(ID_PERIDOT, createSimpleItemSupplier()); // Recipe ingredients - ITEMS.register(ID_PLATE, createSimpleItemSupplier()); - ITEMS.register(ID_CONDUCTIVE_PLATE, createSimpleItemSupplier()); - ITEMS.register(ID_WIRED_PLATE, createSimpleItemSupplier()); - ITEMS.register(ID_BUNDLED_PLATE, createSimpleItemSupplier()); - ITEMS.register(ID_PLATFORMED_PLATE, createSimpleItemSupplier()); - ITEMS.register(ID_ANODE, createSimpleItemSupplier()); - ITEMS.register(ID_CATHODE, createSimpleItemSupplier()); - ITEMS.register(ID_POINTER, createSimpleItemSupplier()); - ITEMS.register(ID_SILICON_CHIP, createSimpleItemSupplier()); - ITEMS.register(ID_ENERGIZED_SILICON_CHIP, createSimpleItemSupplier()); - ITEMS.register(ID_SAND_COAL_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_RED_IRON_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_ELECTROTINE_IRON_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_SILICON_BOULE, createSimpleItemSupplier()); - ITEMS.register(ID_SILICON, createSimpleItemSupplier()); - ITEMS.register(ID_RED_SILICON_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_GLOW_SILICON_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_ELECTROTINE_SILICON_COMP, createSimpleItemSupplier()); - ITEMS.register(ID_INFUSED_SILICON, createSimpleItemSupplier()); - ITEMS.register(ID_ENERGIZED_SILICON, createSimpleItemSupplier()); - ITEMS.register(ID_ELECTROTINE_SILICON, createSimpleItemSupplier()); - ITEMS.register(ID_COPPER_COIL, createSimpleItemSupplier()); - ITEMS.register(ID_IRON_COIL, createSimpleItemSupplier()); - ITEMS.register(ID_GOLD_COIL, createSimpleItemSupplier()); - ITEMS.register(ID_MOTOR, createSimpleItemSupplier()); - ITEMS.register(ID_WOVEN_CLOTH, createSimpleItemSupplier()); - ITEMS.register(ID_SAIL, createSimpleItemSupplier()); - ITEMS.register(ID_WHITE_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_ORANGE_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_MAGENTA_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_LIGHT_BLUE_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_YELLOW_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_LIME_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_PINK_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_GRAY_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_LIGHT_GRAY_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_CYAN_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_PURPLE_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_BLUE_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_BROWN_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_GREEN_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_RED_ILLUMAR, createSimpleItemSupplier()); - ITEMS.register(ID_BLACK_ILLUMAR, createSimpleItemSupplier()); + PLATE_ITEM = ITEMS.register(ID_PLATE, createSimpleItemSupplier()); + CONDUCTIVE_PLATE_ITEM = ITEMS.register(ID_CONDUCTIVE_PLATE, createSimpleItemSupplier()); + WIRED_PLATE_ITEM = ITEMS.register(ID_WIRED_PLATE, createSimpleItemSupplier()); + BUNDLED_PLATE_ITEM = ITEMS.register(ID_BUNDLED_PLATE, createSimpleItemSupplier()); + PLATFORMED_PLATE_ITEM = ITEMS.register(ID_PLATFORMED_PLATE, createSimpleItemSupplier()); + ANODE_ITEM = ITEMS.register(ID_ANODE, createSimpleItemSupplier()); + CATHODE_ITEM = ITEMS.register(ID_CATHODE, createSimpleItemSupplier()); + POINTER_ITEM = ITEMS.register(ID_POINTER, createSimpleItemSupplier()); + SILICON_CHIP_ITEM = ITEMS.register(ID_SILICON_CHIP, createSimpleItemSupplier()); + ENERGIZED_SILICON_CHIP_ITEM = ITEMS.register(ID_ENERGIZED_SILICON_CHIP, createSimpleItemSupplier()); + SAND_COAL_COMP_ITEM = ITEMS.register(ID_SAND_COAL_COMP, createSimpleItemSupplier()); + RED_IRON_COMP_ITEM = ITEMS.register(ID_RED_IRON_COMP, createSimpleItemSupplier()); + ELECTROTINE_IRON_COMP_ITEM = ITEMS.register(ID_ELECTROTINE_IRON_COMP, createSimpleItemSupplier()); + SILICON_BOULE_ITEM = ITEMS.register(ID_SILICON_BOULE, createSimpleItemSupplier()); + SILICON_ITEM = ITEMS.register(ID_SILICON, createSimpleItemSupplier()); + RED_SILICON_COMP_ITEM = ITEMS.register(ID_RED_SILICON_COMP, createSimpleItemSupplier()); + GLOW_SILICON_COMP_ITEM = ITEMS.register(ID_GLOW_SILICON_COMP, createSimpleItemSupplier()); + ELECTROTINE_SILICON_COMP_ITEM = ITEMS.register(ID_ELECTROTINE_SILICON_COMP, createSimpleItemSupplier()); + INFUSED_SILICON_ITEM = ITEMS.register(ID_INFUSED_SILICON, createSimpleItemSupplier()); + ENERGIZED_SILICON_ITEM = ITEMS.register(ID_ENERGIZED_SILICON, createSimpleItemSupplier()); + ELECTROTINE_SILICON_ITEM = ITEMS.register(ID_ELECTROTINE_SILICON, createSimpleItemSupplier()); + COPPER_COIL_ITEM = ITEMS.register(ID_COPPER_COIL, createSimpleItemSupplier()); + IRON_COIL_ITEM = ITEMS.register(ID_IRON_COIL, createSimpleItemSupplier()); + GOLD_COIL_ITEM = ITEMS.register(ID_GOLD_COIL, createSimpleItemSupplier()); + MOTOR_ITEM = ITEMS.register(ID_MOTOR, createSimpleItemSupplier()); + WOVEN_CLOTH_ITEM = ITEMS.register(ID_WOVEN_CLOTH, createSimpleItemSupplier()); + SAIL_ITEM = ITEMS.register(ID_SAIL, createSimpleItemSupplier()); + + // Illumars + WHITE_ILLUMAR_ITEM = ITEMS.register(ID_WHITE_ILLUMAR, createSimpleItemSupplier()); + ORANGE_ILLUMAR_ITEM = ITEMS.register(ID_ORANGE_ILLUMAR, createSimpleItemSupplier()); + MAGENTA_ILLUMAR_ITEM = ITEMS.register(ID_MAGENTA_ILLUMAR, createSimpleItemSupplier()); + LIGHT_BLUE_ILLUMAR_ITEM = ITEMS.register(ID_LIGHT_BLUE_ILLUMAR, createSimpleItemSupplier()); + YELLOW_ILLUMAR_ITEM = ITEMS.register(ID_YELLOW_ILLUMAR, createSimpleItemSupplier()); + LIME_ILLUMAR_ITEM = ITEMS.register(ID_LIME_ILLUMAR, createSimpleItemSupplier()); + PINK_ILLUMAR_ITEM = ITEMS.register(ID_PINK_ILLUMAR, createSimpleItemSupplier()); + GRAY_ILLUMAR_ITEM = ITEMS.register(ID_GRAY_ILLUMAR, createSimpleItemSupplier()); + LIGHT_GRAY_ILLUMAR_ITEM = ITEMS.register(ID_LIGHT_GRAY_ILLUMAR, createSimpleItemSupplier()); + CYAN_ILLUMAR_ITEM = ITEMS.register(ID_CYAN_ILLUMAR, createSimpleItemSupplier()); + PURPLE_ILLUMAR_ITEM = ITEMS.register(ID_PURPLE_ILLUMAR, createSimpleItemSupplier()); + BLUE_ILLUMAR_ITEM = ITEMS.register(ID_BLUE_ILLUMAR, createSimpleItemSupplier()); + BROWN_ILLUMAR_ITEM = ITEMS.register(ID_BROWN_ILLUMAR, createSimpleItemSupplier()); + GREEN_ILLUMAR_ITEM = ITEMS.register(ID_GREEN_ILLUMAR, createSimpleItemSupplier()); + RED_ILLUMAR_ITEM = ITEMS.register(ID_RED_ILLUMAR, createSimpleItemSupplier()); + BLACK_ILLUMAR_ITEM = ITEMS.register(ID_BLACK_ILLUMAR, createSimpleItemSupplier()); // Tools - ITEMS.register(ID_DRAW_PLATE, DrawPlateItem::new); - ITEMS.register(ID_SCREWDRIVER, ScrewdriverItem::new); - ITEMS.register(ID_MULTIMETER, MultimeterItem::new); + DRAW_PLATE_ITEM = ITEMS.register(ID_DRAW_PLATE, DrawPlateItem::new); + SCREWDRIVER_ITEM = ITEMS.register(ID_SCREWDRIVER, ScrewdriverItem::new); + MULTIMETER_ITEM = ITEMS.register(ID_MULTIMETER, MultimeterItem::new); } private static Supplier createSimpleItemSupplier() { return () -> new Item(new Item.Properties().tab(CORE_CREATIVE_TAB)); } + + //region Utilities + public static Item getIllumarByIndex(int index) { + return switch (index) { + case 0 -> WHITE_ILLUMAR_ITEM.get(); + case 1 -> ORANGE_ILLUMAR_ITEM.get(); + case 2 -> MAGENTA_ILLUMAR_ITEM.get(); + case 3 -> LIGHT_BLUE_ILLUMAR_ITEM.get(); + case 4 -> YELLOW_ILLUMAR_ITEM.get(); + case 5 -> LIME_ILLUMAR_ITEM.get(); + case 6 -> PINK_ILLUMAR_ITEM.get(); + case 7 -> GRAY_ILLUMAR_ITEM.get(); + case 8 -> LIGHT_GRAY_ILLUMAR_ITEM.get(); + case 9 -> CYAN_ILLUMAR_ITEM.get(); + case 10 -> PURPLE_ILLUMAR_ITEM.get(); + case 11 -> BLUE_ILLUMAR_ITEM.get(); + case 12 -> BROWN_ILLUMAR_ITEM.get(); + case 13 -> GREEN_ILLUMAR_ITEM.get(); + case 14 -> RED_ILLUMAR_ITEM.get(); + case 15 -> BLACK_ILLUMAR_ITEM.get(); + default -> throw new IllegalArgumentException("Unexpected value: " + index); + }; + } + //endregion } diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreMenus.java b/core/src/main/java/mrtjp/projectred/core/init/CoreMenus.java new file mode 100644 index 000000000..e88276f54 --- /dev/null +++ b/core/src/main/java/mrtjp/projectred/core/init/CoreMenus.java @@ -0,0 +1,20 @@ +package mrtjp.projectred.core.init; + +import codechicken.lib.inventory.container.ICCLContainerType; +import mrtjp.projectred.core.inventory.container.ElectrotineGeneratorContainer; +import net.minecraft.world.inventory.MenuType; +import net.minecraftforge.registries.RegistryObject; + +import static mrtjp.projectred.core.ProjectRedCore.MENU_TYPES; +import static mrtjp.projectred.core.init.CoreBlocks.ID_ELECTROTINE_GENERATOR; + +@SuppressWarnings("NotNullFieldNotInitialized") +public class CoreMenus { + + public static RegistryObject> ELECTROTINE_GENERATOR_CONTAINER; + + public static void register() { + + ELECTROTINE_GENERATOR_CONTAINER = MENU_TYPES.register(ID_ELECTROTINE_GENERATOR, () -> ICCLContainerType.create(ElectrotineGeneratorContainer.FACTORY)); + } +} diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreReferences.java b/core/src/main/java/mrtjp/projectred/core/init/CoreReferences.java deleted file mode 100644 index 1bbf5c9e3..000000000 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreReferences.java +++ /dev/null @@ -1,137 +0,0 @@ -package mrtjp.projectred.core.init; - -import mrtjp.projectred.core.inventory.container.ElectrotineGeneratorContainer; -import mrtjp.projectred.core.tile.ElectrotineGeneratorTile; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.ObjectHolder; - -import static mrtjp.projectred.core.ProjectRedCore.MOD_ID; -import static mrtjp.projectred.core.init.CoreBlocks.ID_ELECTROTINE_GENERATOR; -import static mrtjp.projectred.core.init.CoreItems.*; - -@ObjectHolder(MOD_ID) -@SuppressWarnings("NotNullFieldNotInitialized") -public class CoreReferences { - - // Blocks - @ObjectHolder(ID_ELECTROTINE_GENERATOR) - public static Block ELECTROTINE_GENERATOR_BLOCK; - - // Containers - @ObjectHolder(ID_ELECTROTINE_GENERATOR) - public static MenuType ELECTROTINE_GENERATOR_CONTAINER; - - // Tile - @ObjectHolder(ID_ELECTROTINE_GENERATOR) - public static BlockEntityType ELECTROTINE_GENERATOR_TILE; - - // Items - @ObjectHolder(ID_PLATE) - public static Item PLATE_ITEM; - @ObjectHolder(ID_CONDUCTIVE_PLATE) - public static Item CONDUCTIVE_PLATE_ITEM; - @ObjectHolder(ID_WIRED_PLATE) - public static Item WIRED_PLATE_ITEM; - @ObjectHolder(ID_BUNDLED_PLATE) - public static Item BUNDLED_PLATE_ITEM; - @ObjectHolder(ID_PLATFORMED_PLATE) - public static Item PLATFORMED_PLATE_ITEM; - @ObjectHolder(ID_ANODE) - public static Item ANODE_ITEM; - @ObjectHolder(ID_CATHODE) - public static Item CATHODE_ITEM; - @ObjectHolder(ID_POINTER) - public static Item POINTER_ITEM; - @ObjectHolder(ID_SILICON_CHIP) - public static Item SILICON_CHIP_ITEM; - @ObjectHolder(ID_ENERGIZED_SILICON_CHIP) - public static Item ENERGIZED_SILICON_CHIP_ITEM; - @ObjectHolder(ID_RED_ALLOY_INGOT) - public static Item RED_ALLOY_INGOT_ITEM; - @ObjectHolder(ID_ELECTROTINE_ALLOY_INGOT) - public static Item ELECTROTINE_ALLOY_INGOT_ITEM; - @ObjectHolder(ID_ELECTROTINE_DUST) - public static Item ELECTROTINE_DUST_ITEM; - @ObjectHolder(ID_RUBY) - public static Item RUBY_ITEM; - @ObjectHolder(ID_SAPPHIRE) - public static Item SAPPHIRE_ITEM; - @ObjectHolder(ID_PERIDOT) - public static Item PERIDOT_ITEM; - @ObjectHolder(ID_SAND_COAL_COMP) - public static Item SAND_COAL_COMP_ITEM; - @ObjectHolder(ID_RED_IRON_COMP) - public static Item RED_IRON_COMP_ITEM; - @ObjectHolder(ID_ELECTROTINE_IRON_COMP) - public static Item ELECTROTINE_IRON_COMP_ITEM; - @ObjectHolder(ID_SILICON_BOULE) - public static Item SILICON_BOULE_ITEM; - @ObjectHolder(ID_SILICON) - public static Item SILICON_ITEM; - @ObjectHolder(ID_RED_SILICON_COMP) - public static Item RED_SILICON_COMP_ITEM; - @ObjectHolder(ID_GLOW_SILICON_COMP) - public static Item GLOW_SILICON_COMP_ITEM; - @ObjectHolder(ID_ELECTROTINE_SILICON_COMP) - public static Item ELECTROTINE_SILICON_COMP_ITEM; - @ObjectHolder(ID_INFUSED_SILICON) - public static Item INFUSED_SILICON_ITEM; - @ObjectHolder(ID_ENERGIZED_SILICON) - public static Item ENERGIZED_SILICON_ITEM; - @ObjectHolder(ID_ELECTROTINE_SILICON) - public static Item ELECTROTINE_SILICON_ITEM; - @ObjectHolder(ID_COPPER_COIL) - public static Item COPPER_COIL_ITEM; - @ObjectHolder(ID_IRON_COIL) - public static Item IRON_COIL_ITEM; - @ObjectHolder(ID_GOLD_COIL) - public static Item GOLD_COIL_ITEM; - @ObjectHolder(ID_MOTOR) - public static Item MOTOR_ITEM; - @ObjectHolder(ID_WOVEN_CLOTH) - public static Item WOVEN_CLOTH_ITEM; - @ObjectHolder(ID_SAIL) - public static Item SAIL_ITEM; - @ObjectHolder(ID_WHITE_ILLUMAR) - public static Item WHITE_ILLUMAR_ITEM; - @ObjectHolder(ID_ORANGE_ILLUMAR) - public static Item ORANGE_ILLUMAR_ITEM; - @ObjectHolder(ID_MAGENTA_ILLUMAR) - public static Item MAGENTA_ILLUMAR_ITEM; - @ObjectHolder(ID_LIGHT_BLUE_ILLUMAR) - public static Item LIGHT_BLUE_ILLUMAR_ITEM; - @ObjectHolder(ID_YELLOW_ILLUMAR) - public static Item YELLOW_ILLUMAR_ITEM; - @ObjectHolder(ID_LIME_ILLUMAR) - public static Item LIME_ILLUMAR_ITEM; - @ObjectHolder(ID_PINK_ILLUMAR) - public static Item PINK_ILLUMAR_ITEM; - @ObjectHolder(ID_GRAY_ILLUMAR) - public static Item GRAY_ILLUMAR_ITEM; - @ObjectHolder(ID_LIGHT_GRAY_ILLUMAR) - public static Item LIGHT_GRAY_ILLUMAR_ITEM; - @ObjectHolder(ID_CYAN_ILLUMAR) - public static Item CYAN_ILLUMAR_ITEM; - @ObjectHolder(ID_PURPLE_ILLUMAR) - public static Item PURPLE_ILLUMAR_ITEM; - @ObjectHolder(ID_BLUE_ILLUMAR) - public static Item BLUE_ILLUMAR_ITEM; - @ObjectHolder(ID_BROWN_ILLUMAR) - public static Item BROWN_ILLUMAR_ITEM; - @ObjectHolder(ID_GREEN_ILLUMAR) - public static Item GREEN_ILLUMAR_ITEM; - @ObjectHolder(ID_RED_ILLUMAR) - public static Item RED_ILLUMAR_ITEM; - @ObjectHolder(ID_BLACK_ILLUMAR) - public static Item BLACK_ILLUMAR_ITEM; - - @ObjectHolder(ID_DRAW_PLATE) - public static Item DRAW_PLATE_ITEM; - @ObjectHolder(ID_SCREWDRIVER) - public static Item SCREWDRIVER_ITEM; - @ObjectHolder(ID_MULTIMETER) - public static Item MULTIMETER_ITEM; -} diff --git a/core/src/main/java/mrtjp/projectred/core/inventory/container/ElectrotineGeneratorContainer.java b/core/src/main/java/mrtjp/projectred/core/inventory/container/ElectrotineGeneratorContainer.java index 0e1496898..3855120cb 100644 --- a/core/src/main/java/mrtjp/projectred/core/inventory/container/ElectrotineGeneratorContainer.java +++ b/core/src/main/java/mrtjp/projectred/core/inventory/container/ElectrotineGeneratorContainer.java @@ -9,8 +9,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_DUST_ITEM; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_CONTAINER; +import static mrtjp.projectred.core.init.CoreItems.ELECTROTINE_DUST_ITEM; +import static mrtjp.projectred.core.init.CoreMenus.ELECTROTINE_GENERATOR_CONTAINER; public class ElectrotineGeneratorContainer extends BasePoweredTileContainer { @@ -28,7 +28,7 @@ public class ElectrotineGeneratorContainer extends BasePoweredTileContainer { private int powerStored = 0; public ElectrotineGeneratorContainer(Inventory playerInventory, ElectrotineGeneratorTile tile, int windowId) { - super(ELECTROTINE_GENERATOR_CONTAINER, windowId, tile); + super(ELECTROTINE_GENERATOR_CONTAINER.get(), windowId, tile); this.playerInventory = playerInventory; this.tile = tile; @@ -44,7 +44,7 @@ private void addElectrotineGeneratorInventory() { addSlot(new Slot(tile.getInventory(), 0, 134, 42) { @Override public boolean mayPlace(ItemStack stack) { - return stack.getItem() == ELECTROTINE_DUST_ITEM; + return stack.getItem() == ELECTROTINE_DUST_ITEM.get(); } }); } @@ -61,7 +61,7 @@ public ItemStack quickMoveStack(Player player, int slotIndex) { if (isFuel(slotIndex)) { if (!moveToEntireInventory(stack, false)) return ItemStack.EMPTY; - } else if (stack.getItem() == ELECTROTINE_DUST_ITEM) { + } else if (stack.getItem() == ELECTROTINE_DUST_ITEM.get()) { if (!moveToFuel(stack, false)) return ItemStack.EMPTY; } else if (isPlayerInventory(slotIndex)) { diff --git a/core/src/main/java/mrtjp/projectred/core/part/IPropagationCenterPart.java b/core/src/main/java/mrtjp/projectred/core/part/IPropagationCenterPart.java index af689910d..279de134f 100644 --- a/core/src/main/java/mrtjp/projectred/core/part/IPropagationCenterPart.java +++ b/core/src/main/java/mrtjp/projectred/core/part/IPropagationCenterPart.java @@ -40,8 +40,7 @@ default void propagateBackward(@Nullable IPropagationPart prev, int mode) { default boolean propagateTo(@Nullable IConnectable to, @Nullable IPropagationPart prev, int mode) { if (to != null) { if (to == prev) return false; - if (to instanceof IPropagationPart) { - IPropagationPart part = (IPropagationPart) to; + if (to instanceof IPropagationPart part) { if (shouldPropagate(part, mode)) { RedstonePropagator.propagateTo(part, this, mode); return true; diff --git a/core/src/main/java/mrtjp/projectred/core/part/IPropagationFacePart.java b/core/src/main/java/mrtjp/projectred/core/part/IPropagationFacePart.java index 6cb48d651..d4ee5bfa9 100644 --- a/core/src/main/java/mrtjp/projectred/core/part/IPropagationFacePart.java +++ b/core/src/main/java/mrtjp/projectred/core/part/IPropagationFacePart.java @@ -54,8 +54,7 @@ default int getPropagationMask() { default boolean propagateTo(@Nullable IConnectable to, @Nullable IPropagationPart prev, int mode) { if (to != null) { if (to == prev) return false; - if (to instanceof IPropagationPart) { - IPropagationPart part = (IPropagationPart) to; + if (to instanceof IPropagationPart part) { if (shouldPropagate(part, mode)) { RedstonePropagator.propagateTo(part, this, mode); return true; diff --git a/core/src/main/java/mrtjp/projectred/core/tile/ElectrotineGeneratorTile.java b/core/src/main/java/mrtjp/projectred/core/tile/ElectrotineGeneratorTile.java index f97c4ca37..6ca9735c3 100644 --- a/core/src/main/java/mrtjp/projectred/core/tile/ElectrotineGeneratorTile.java +++ b/core/src/main/java/mrtjp/projectred/core/tile/ElectrotineGeneratorTile.java @@ -30,8 +30,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_DUST_ITEM; -import static mrtjp.projectred.core.init.CoreReferences.ELECTROTINE_GENERATOR_TILE; +import static mrtjp.projectred.core.init.CoreBlocks.ELECTROTINE_GENERATOR_TILE; +import static mrtjp.projectred.core.init.CoreItems.ELECTROTINE_DUST_ITEM; public class ElectrotineGeneratorTile extends BasePoweredTile implements ILowLoadMachine { @@ -46,7 +46,7 @@ public class ElectrotineGeneratorTile extends BasePoweredTile implements ILowLoa private int powerStored = 0; public ElectrotineGeneratorTile(BlockPos pos, BlockState state) { - super(ELECTROTINE_GENERATOR_TILE, pos, state); + super(ELECTROTINE_GENERATOR_TILE.get(), pos, state); } @Override @@ -244,7 +244,7 @@ public ElectrotineGeneratorInventory() { @Override public boolean canPlaceItem(int slot, ItemStack stack) { - return stack.getItem() == ELECTROTINE_DUST_ITEM; + return stack.getItem() == ELECTROTINE_DUST_ITEM.get(); } } } diff --git a/core/src/main/java/mrtjp/projectred/core/tile/IConnectableTile.java b/core/src/main/java/mrtjp/projectred/core/tile/IConnectableTile.java index 8b7badd0b..2133303a7 100644 --- a/core/src/main/java/mrtjp/projectred/core/tile/IConnectableTile.java +++ b/core/src/main/java/mrtjp/projectred/core/tile/IConnectableTile.java @@ -179,8 +179,7 @@ default boolean outsideCornerEdgeOpen(int s, int edgeRot) { default boolean discoverStraightCenter(int s) { MultiPart p = getStraightCenter(s); - if (p instanceof IConnectable) { - IConnectable connectable = (IConnectable) p; + if (p instanceof IConnectable connectable) { return canConnectPart(connectable, s, -1) && connectable.connectStraight(this, s ^ 1, -1); } @@ -189,8 +188,7 @@ default boolean discoverStraightCenter(int s) { default boolean discoverStraight(int s, int edgeRot) { MultiPart p = getStraight(s, edgeRot); - if (p instanceof IConnectable) { - IConnectable connectable = (IConnectable) p; + if (p instanceof IConnectable connectable) { return canConnectPart(connectable, s, edgeRot) && connectable.connectStraight(this, rotFromStraight(s, edgeRot), -1); } @@ -199,8 +197,7 @@ default boolean discoverStraight(int s, int edgeRot) { default boolean discoverCorner(int s, int edgeRot) { MultiPart p = getCorner(s, edgeRot); - if (p instanceof IConnectable) { - IConnectable connectable = (IConnectable) p; + if (p instanceof IConnectable connectable) { return canConnectPart(connectable, s, edgeRot) && outsideCornerEdgeOpen(s, edgeRot) && connectable.canConnectCorner(rotFromCorner(s, edgeRot)) && //TODO shouldnt this be handled by next line? @@ -214,8 +211,7 @@ default boolean discoverCorner(int s, int edgeRot) { default boolean discoverStraightCenterOverride(int s) { BlockPos pos = posOfStraight(s); BlockEntity tile = getBlockLevel().getBlockEntity(pos); - if (tile instanceof IConnectable) { - IConnectable connectable = (IConnectable) tile; + if (tile instanceof IConnectable connectable) { return canConnectPart(connectable, s, -1) && connectable.connectStraight(this, s, -1); } diff --git a/core/src/main/java/mrtjp/projectred/lib/Point.java b/core/src/main/java/mrtjp/projectred/lib/Point.java index 4527f04eb..de0c98dec 100644 --- a/core/src/main/java/mrtjp/projectred/lib/Point.java +++ b/core/src/main/java/mrtjp/projectred/lib/Point.java @@ -94,8 +94,7 @@ public Point offset(int r, int amount) { @Override public boolean equals(Object obj) { - if (obj instanceof Point) { - Point p = (Point) obj; + if (obj instanceof Point p) { return x == p.x && y == p.y; } return false; diff --git a/core/src/main/java/mrtjp/projectred/lib/Size.java b/core/src/main/java/mrtjp/projectred/lib/Size.java index e6cc2f223..6a1bcb86f 100644 --- a/core/src/main/java/mrtjp/projectred/lib/Size.java +++ b/core/src/main/java/mrtjp/projectred/lib/Size.java @@ -51,8 +51,7 @@ public Vec2 toVec2() { @Override public boolean equals(Object obj) { - if (obj instanceof Size) { - Size size = (Size) obj; + if (obj instanceof Size size) { return size.width == width && size.height == height; } return false; diff --git a/core/src/main/java/mrtjp/projectred/lib/Vec2.java b/core/src/main/java/mrtjp/projectred/lib/Vec2.java index 5c6bca993..057c79adb 100644 --- a/core/src/main/java/mrtjp/projectred/lib/Vec2.java +++ b/core/src/main/java/mrtjp/projectred/lib/Vec2.java @@ -108,8 +108,7 @@ public Vec2 axialProject() { @Override public boolean equals(Object obj) { - if (obj instanceof Vec2) { - Vec2 other = (Vec2) obj; + if (obj instanceof Vec2 other) { return dx == other.dx && dy == other.dy; } return false; diff --git a/core/src/test/java/mrtjp/projectred/lib/ModelVoxelShapeTest.java b/core/src/test/java/mrtjp/projectred/lib/ModelVoxelShapeTest.java index d74cb0602..1718ce03a 100644 --- a/core/src/test/java/mrtjp/projectred/lib/ModelVoxelShapeTest.java +++ b/core/src/test/java/mrtjp/projectred/lib/ModelVoxelShapeTest.java @@ -83,7 +83,7 @@ public static void assertEqualsT(@Nullable Vector3 a, @Nullable Vector3 b) { assertTrue(a.equalsT(b)); } - public List createTestCases() { + private List createTestCases() { List testCases = new LinkedList<>(); // Simple half-quad on the XZ plane with normal facing up diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/ProjectRedExpansion.java b/expansion/src/main/java/mrtjp/projectred/expansion/ProjectRedExpansion.java index dc898373a..2d57cc4c4 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/ProjectRedExpansion.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/ProjectRedExpansion.java @@ -38,18 +38,18 @@ public class ProjectRedExpansion { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); - public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); + public static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); + public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); + public static final DeferredRegister> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); public static final DeferredRegister PART_CONVERTERS = DeferredRegister.create(PartConverter.PART_CONVERTERS, MOD_ID); - public static final SimpleCreativeTab EXPANSION_GROUP = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(ExpansionReferences.PROJECT_BENCH_BLOCK)); + public static final SimpleCreativeTab EXPANSION_GROUP = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(ExpansionBlocks.PROJECT_BENCH_BLOCK.get())); static { ProjectRedAPI.expansionAPI = ExpansionAPI.INSTANCE; ExpansionBlocks.register(); - ExpansionContainers.register(); + ExpansionMenus.register(); ExpansionItems.register(); ExpansionParts.register(); } @@ -64,9 +64,9 @@ public ProjectRedExpansion() { BLOCKS.register(modEventBus); ITEMS.register(modEventBus); - BLOCK_ENTITIES.register(modEventBus); - CONTAINERS.register(modEventBus); - PARTS.register(modEventBus); + BLOCK_ENTITY_TYPES.register(modEventBus); + MENU_TYPES.register(modEventBus); + PART_TYPES.register(modEventBus); PART_CONVERTERS.register(modEventBus); MinecraftForge.EVENT_BUS.addListener(MovementManager::onChunkWatchEvent); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/AutoCrafterBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/AutoCrafterBlock.java index 81f2b68d5..50f278409 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/AutoCrafterBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/AutoCrafterBlock.java @@ -1,6 +1,6 @@ package mrtjp.projectred.expansion.block; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.AutoCrafterTile; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; @@ -22,6 +22,6 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.AUTO_CRAFTER_TILE; + return ExpansionBlocks.AUTO_CRAFTER_TILE.get(); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/BatteryBoxBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/BatteryBoxBlock.java index 3ef75032e..e8e341caa 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/BatteryBoxBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/BatteryBoxBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.block; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.BatteryBoxTile; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -45,7 +45,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.BATTERY_BOX_TILE; + return ExpansionBlocks.BATTERY_BOX_TILE.get(); } @Nullable @@ -63,8 +63,7 @@ protected void createBlockStateDefinition(StateDefinition.Builder getDrops(BlockState state, LootContext.Builder builder) { BlockEntity tile = builder.getParameter(LootContextParams.BLOCK_ENTITY); - if (tile instanceof BatteryBoxTile) { - BatteryBoxTile batteryBoxTile = (BatteryBoxTile) tile; + if (tile instanceof BatteryBoxTile batteryBoxTile) { return Collections.singletonList(batteryBoxTile.createStackWithStoredPower()); // Retain power inside itemstack } return super.getDrops(state, builder); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/ChargingBenchBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/ChargingBenchBlock.java index 132130119..b06f3cae7 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/ChargingBenchBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/ChargingBenchBlock.java @@ -2,7 +2,7 @@ import codechicken.lib.vec.Rotation; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.ChargingBenchTile; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; @@ -28,7 +28,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.CHARGING_BENCH_TILE; + return ExpansionBlocks.CHARGING_BENCH_TILE.get(); } @Nullable diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/FireStarterBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/FireStarterBlock.java index 537e995c8..1278c46ce 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/FireStarterBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/FireStarterBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.block; import mrtjp.projectred.core.tile.IBlockEventTile; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.FireStarterTile; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -25,7 +25,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.FIRE_STARTER_TILE; + return ExpansionBlocks.FIRE_STARTER_TILE.get(); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameActuatorBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameActuatorBlock.java index 5ae64b2c2..8800d1270 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameActuatorBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameActuatorBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.block; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.FrameActuatorTile; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; @@ -26,7 +26,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.FRAME_ACTUATOR_TILE; + return ExpansionBlocks.FRAME_ACTUATOR_TILE.get(); } @Nullable diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameBlock.java index 67338fcdf..fba20a03b 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameBlock.java @@ -110,7 +110,7 @@ public VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPo //region Shape generation public static VoxelShape getOrGenerateShape(int mask) { VoxelShape s = shapes[mask & 0x3F]; - if (s == null || true) { + if (s == null) { s = generateShape(mask); shapes[mask & 0x3F] = s; } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameMotorBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameMotorBlock.java index 384183edc..db623b7b0 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameMotorBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/FrameMotorBlock.java @@ -5,7 +5,7 @@ import codechicken.lib.vec.Rotation; import mrtjp.projectred.core.block.ProjectRedBlock; import mrtjp.projectred.expansion.client.FrameMotorBlockRenderer; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.FrameMotorTile; import net.minecraft.client.particle.ParticleEngine; import net.minecraft.core.BlockPos; @@ -66,7 +66,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.FRAME_MOTOR_TILE; + return ExpansionBlocks.FRAME_MOTOR_TILE.get(); } @Nullable diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/block/ProjectBenchBlock.java b/expansion/src/main/java/mrtjp/projectred/expansion/block/ProjectBenchBlock.java index 2c837076a..5fd6e09ca 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/block/ProjectBenchBlock.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/block/ProjectBenchBlock.java @@ -2,7 +2,7 @@ import codechicken.lib.vec.Rotation; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.tile.ProjectBenchTile; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; @@ -28,7 +28,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return ExpansionReferences.PROJECT_BENCH_TILE; + return ExpansionBlocks.PROJECT_BENCH_TILE.get(); } @Nullable diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java index b515f9a45..c57a9f919 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameBlockRenderer.java @@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.block.model.ItemTransforms; @@ -31,7 +31,7 @@ private FrameBlockRenderer() { //region ICCBlockRenderer @Override public boolean canHandleBlock(BlockAndTintGetter world, BlockPos pos, BlockState blockState) { - return blockState.getBlock() == ExpansionReferences.FRAME_BLOCK; + return blockState.getBlock() == ExpansionBlocks.FRAME_BLOCK.get(); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java index 1c11eefd0..7f18111fb 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/client/FrameMotorBlockRenderer.java @@ -5,7 +5,7 @@ import codechicken.lib.vec.uv.MultiIconTransformation; import mrtjp.projectred.core.block.ProjectRedBlock; import mrtjp.projectred.core.client.FullyOrientableBlockRenderer; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.ModelState; @@ -42,7 +42,7 @@ private FrameMotorBlockRenderer() { @Override public boolean canHandleBlock(BlockAndTintGetter world, BlockPos pos, BlockState blockState) { - return blockState.getBlock() == ExpansionReferences.FRAME_MOTOR_BLOCK; + return blockState.getBlock() == ExpansionBlocks.FRAME_MOTOR_BLOCK.get(); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockStateModelProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockStateModelProvider.java index cb557c09e..6cdac2597 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockStateModelProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockStateModelProvider.java @@ -13,7 +13,7 @@ import javax.annotation.Nonnull; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; @SuppressWarnings("DataFlowIssue") public class ExpansionBlockStateModelProvider extends BlockStateProvider { @@ -32,17 +32,17 @@ public ExpansionBlockStateModelProvider(DataGenerator gen, ExistingFileHelper ex @Override protected void registerStatesAndModels() { - addRotatableOppositeMatchingFacesBlock(PROJECT_BENCH_BLOCK); - addBatteryBoxBlock(BATTERY_BOX_BLOCK); - addTriStateFrontFacedPoweredMachineBlock(AUTO_CRAFTER_BLOCK); - addBiStateSideAndTopMachineBlock(CHARGING_BENCH_BLOCK); - addSidedOppositeMatchingFacesDeviceBlock(FIRE_STARTER_BLOCK); - addTriStateSidedPoweredDeviceBlock(FRAME_ACTUATOR_BLOCK); + addRotatableOppositeMatchingFacesBlock(PROJECT_BENCH_BLOCK.get()); + addBatteryBoxBlock(BATTERY_BOX_BLOCK.get()); + addTriStateFrontFacedPoweredMachineBlock(AUTO_CRAFTER_BLOCK.get()); + addBiStateSideAndTopMachineBlock(CHARGING_BENCH_BLOCK.get()); + addSidedOppositeMatchingFacesDeviceBlock(FIRE_STARTER_BLOCK.get()); + addTriStateSidedPoweredDeviceBlock(FRAME_ACTUATOR_BLOCK.get()); // Advanced models rendered programmatically. Tied to dummy model to suppress warnings. ModelFile dummy = models().withExistingParent("programmatically_rendered_block", "block"); - simpleBlock(FRAME_BLOCK, dummy); - simpleBlock(FRAME_MOTOR_BLOCK, dummy); + simpleBlock(FRAME_BLOCK.get(), dummy); + simpleBlock(FRAME_MOTOR_BLOCK.get(), dummy); } private void addRotatableOppositeMatchingFacesBlock(Block block) { diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockTagsProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockTagsProvider.java index d89a14fc5..5cd9b033d 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockTagsProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionBlockTagsProvider.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; public class ExpansionBlockTagsProvider extends BlockTagsProvider { @@ -24,23 +24,23 @@ public String getName() { protected void addTags() { tag(BlockTags.MINEABLE_WITH_AXE) - .add(BATTERY_BOX_BLOCK) - .add(FRAME_BLOCK); + .add(BATTERY_BOX_BLOCK.get()) + .add(FRAME_BLOCK.get()); tag(BlockTags.MINEABLE_WITH_PICKAXE) - .add(PROJECT_BENCH_BLOCK) - .add(CHARGING_BENCH_BLOCK) - .add(AUTO_CRAFTER_BLOCK) - .add(FIRE_STARTER_BLOCK) - .add(FRAME_MOTOR_BLOCK) - .add(FRAME_ACTUATOR_BLOCK); + .add(PROJECT_BENCH_BLOCK.get()) + .add(CHARGING_BENCH_BLOCK.get()) + .add(AUTO_CRAFTER_BLOCK.get()) + .add(FIRE_STARTER_BLOCK.get()) + .add(FRAME_MOTOR_BLOCK.get()) + .add(FRAME_ACTUATOR_BLOCK.get()); tag(BlockTags.NEEDS_STONE_TOOL) - .add(PROJECT_BENCH_BLOCK) - .add(CHARGING_BENCH_BLOCK) - .add(AUTO_CRAFTER_BLOCK) - .add(FIRE_STARTER_BLOCK) - .add(FRAME_MOTOR_BLOCK) - .add(FRAME_ACTUATOR_BLOCK); + .add(PROJECT_BENCH_BLOCK.get()) + .add(CHARGING_BENCH_BLOCK.get()) + .add(AUTO_CRAFTER_BLOCK.get()) + .add(FIRE_STARTER_BLOCK.get()) + .add(FRAME_MOTOR_BLOCK.get()) + .add(FRAME_ACTUATOR_BLOCK.get()); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java index 4b4281140..4d58143af 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionItemModelProvider.java @@ -1,17 +1,18 @@ package mrtjp.projectred.expansion.data; import codechicken.lib.datagen.ItemModelProvider; -import net.minecraft.world.level.block.Block; import net.minecraft.data.DataGenerator; import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; import static mrtjp.projectred.expansion.init.ExpansionClientInit.ITEM_MODEL_PROPERTY_CHARGE_LEVEL; import static mrtjp.projectred.expansion.init.ExpansionClientInit.ITEM_MODEL_PROPERTY_WRITTEN_RECIPE_PLAN; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionItems.*; public class ExpansionItemModelProvider extends ItemModelProvider { @@ -27,24 +28,24 @@ public String getName() { @Override protected void registerModels() { - simpleItemBlock(PROJECT_BENCH_BLOCK); - simpleItemBlock(BATTERY_BOX_BLOCK); - simpleItemBlock(AUTO_CRAFTER_BLOCK); - simpleItemBlock(CHARGING_BENCH_BLOCK); - simpleItemBlock(FIRE_STARTER_BLOCK); - simpleItemBlock(FRAME_ACTUATOR_BLOCK); + simpleItemBlock(PROJECT_BENCH_BLOCK.get()); + simpleItemBlock(BATTERY_BOX_BLOCK.get()); + simpleItemBlock(AUTO_CRAFTER_BLOCK.get()); + simpleItemBlock(CHARGING_BENCH_BLOCK.get()); + simpleItemBlock(FIRE_STARTER_BLOCK.get()); + simpleItemBlock(FRAME_ACTUATOR_BLOCK.get()); - generated(FRAME_BLOCK).noTexture(); - generated(FRAME_MOTOR_BLOCK).noTexture(); + generated(FRAME_BLOCK.get()).noTexture(); + generated(FRAME_MOTOR_BLOCK.get()).noTexture(); generated(EMPTY_BATTERY_ITEM); generated(BATTERY_ITEM); handheld(ELECTRIC_SCREWDRIVER_ITEM); - writablePlanItem(RECIPE_PLAN_ITEM); + writablePlanItem(RECIPE_PLAN_ITEM.get()); - chargeableItemBlock(BATTERY_BOX_BLOCK, 8); + chargeableItemBlock(BATTERY_BOX_BLOCK.get(), 8); } private void chargeableItemBlock(Block block, int chargeLevels) { diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLanguageProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLanguageProvider.java index 4256cba61..ab67c04a6 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLanguageProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLanguageProvider.java @@ -4,7 +4,8 @@ import net.minecraftforge.common.data.LanguageProvider; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; +import static mrtjp.projectred.expansion.init.ExpansionItems.*; import static mrtjp.projectred.expansion.init.ExpansionUnlocal.UL_PLAN_RESULT; import static mrtjp.projectred.expansion.init.ExpansionUnlocal.UL_STORED_POWER_TOOLTIP; @@ -25,19 +26,19 @@ protected void addTranslations() { // Creative tab add("itemGroup." + MOD_ID, "Project Red: Expansion"); - add(PROJECT_BENCH_BLOCK, "Project Bench"); - add(BATTERY_BOX_BLOCK, "Battery Box"); - add(AUTO_CRAFTER_BLOCK, "Auto Crafter"); - add(CHARGING_BENCH_BLOCK, "Charging Bench"); - add(FIRE_STARTER_BLOCK, "Fire Starter"); - add(FRAME_BLOCK, "Frame"); - add(FRAME_MOTOR_BLOCK, "Frame Motor"); - add(FRAME_ACTUATOR_BLOCK, "Frame Actuator"); - - add(RECIPE_PLAN_ITEM, "Recipe Plan"); - add(EMPTY_BATTERY_ITEM, "Empty Battery"); - add(BATTERY_ITEM, "Battery"); - add(ELECTRIC_SCREWDRIVER_ITEM, "Electric Screwdriver"); + add(PROJECT_BENCH_BLOCK.get(), "Project Bench"); + add(BATTERY_BOX_BLOCK.get(), "Battery Box"); + add(AUTO_CRAFTER_BLOCK.get(), "Auto Crafter"); + add(CHARGING_BENCH_BLOCK.get(), "Charging Bench"); + add(FIRE_STARTER_BLOCK.get(), "Fire Starter"); + add(FRAME_BLOCK.get(), "Frame"); + add(FRAME_MOTOR_BLOCK.get(), "Frame Motor"); + add(FRAME_ACTUATOR_BLOCK.get(), "Frame Actuator"); + + add(RECIPE_PLAN_ITEM.get(), "Recipe Plan"); + add(EMPTY_BATTERY_ITEM.get(), "Empty Battery"); + add(BATTERY_ITEM.get(), "Battery"); + add(ELECTRIC_SCREWDRIVER_ITEM.get(), "Electric Screwdriver"); // Strings add(UL_STORED_POWER_TOOLTIP, "Stored power"); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLootTableProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLootTableProvider.java index 255436e48..1fdbba2e3 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLootTableProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionLootTableProvider.java @@ -3,7 +3,7 @@ import codechicken.lib.datagen.LootTableProvider; import net.minecraft.data.DataGenerator; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; public class ExpansionLootTableProvider extends LootTableProvider.BlockLootProvider { @@ -19,13 +19,13 @@ public String getName() { @Override protected void registerTables() { - register(PROJECT_BENCH_BLOCK, singleItem(PROJECT_BENCH_BLOCK)); - register(BATTERY_BOX_BLOCK, singleItem(BATTERY_BOX_BLOCK)); - register(AUTO_CRAFTER_BLOCK, singleItem(AUTO_CRAFTER_BLOCK)); - register(CHARGING_BENCH_BLOCK, singleItem(CHARGING_BENCH_BLOCK)); - register(FIRE_STARTER_BLOCK, singleItem(FIRE_STARTER_BLOCK)); - register(FRAME_BLOCK, singleItem(FRAME_BLOCK)); - register(FRAME_MOTOR_BLOCK, singleItem(FRAME_MOTOR_BLOCK)); - register(FRAME_ACTUATOR_BLOCK, singleItem(FRAME_ACTUATOR_BLOCK)); + register(PROJECT_BENCH_BLOCK.get(), singleItem(PROJECT_BENCH_BLOCK.get())); + register(BATTERY_BOX_BLOCK.get(), singleItem(BATTERY_BOX_BLOCK.get())); + register(AUTO_CRAFTER_BLOCK.get(), singleItem(AUTO_CRAFTER_BLOCK.get())); + register(CHARGING_BENCH_BLOCK.get(), singleItem(CHARGING_BENCH_BLOCK.get())); + register(FIRE_STARTER_BLOCK.get(), singleItem(FIRE_STARTER_BLOCK.get())); + register(FRAME_BLOCK.get(), singleItem(FRAME_BLOCK.get())); + register(FRAME_MOTOR_BLOCK.get(), singleItem(FRAME_MOTOR_BLOCK.get())); + register(FRAME_ACTUATOR_BLOCK.get(), singleItem(FRAME_ACTUATOR_BLOCK.get())); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionRecipeProvider.java b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionRecipeProvider.java index c635c1675..f9e47126e 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionRecipeProvider.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/data/ExpansionRecipeProvider.java @@ -7,10 +7,11 @@ import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import static mrtjp.projectred.core.init.CoreReferences.COPPER_COIL_ITEM; -import static mrtjp.projectred.core.init.CoreReferences.MOTOR_ITEM; +import static mrtjp.projectred.core.init.CoreItems.COPPER_COIL_ITEM; +import static mrtjp.projectred.core.init.CoreItems.MOTOR_ITEM; import static mrtjp.projectred.core.init.CoreTags.*; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; +import static mrtjp.projectred.expansion.init.ExpansionItems.*; import static net.minecraftforge.common.Tags.Items.INGOTS_COPPER; public class ExpansionRecipeProvider extends RecipeProvider { @@ -28,14 +29,14 @@ public String getName() { protected void registerRecipes() { //Blocks - shapedRecipe(FRAME_BLOCK, 8) + shapedRecipe(FRAME_BLOCK.get(), 8) .key('S', Items.STICK) .key('L', ItemTags.LOGS) .patternLine("SLS") .patternLine("LSL") .patternLine("SLS"); - shapedRecipe(PROJECT_BENCH_BLOCK, 1) + shapedRecipe(PROJECT_BENCH_BLOCK.get(), 1) .key('S', Tags.Items.STONE) .key('W', ItemTags.PLANKS) .key('B', Blocks.CRAFTING_TABLE) @@ -44,8 +45,8 @@ protected void registerRecipes() { .patternLine("WBW") .patternLine("WCW"); - shapedRecipe(BATTERY_BOX_BLOCK, 1) - .key('B', BATTERY_ITEM) + shapedRecipe(BATTERY_BOX_BLOCK.get(), 1) + .key('B', BATTERY_ITEM.get()) .key('W', ItemTags.PLANKS) .key('I', Tags.Items.INGOTS_IRON) .key('E', ELECTROTINE_ALLOY_INGOT_TAG) @@ -53,18 +54,18 @@ protected void registerRecipes() { .patternLine("BIB") .patternLine("IEI"); - shapedRecipe(CHARGING_BENCH_BLOCK, 1) + shapedRecipe(CHARGING_BENCH_BLOCK.get(), 1) .key('S', Tags.Items.STONE) - .key('C', COPPER_COIL_ITEM) + .key('C', COPPER_COIL_ITEM.get()) .key('W', ItemTags.PLANKS) - .key('B', BATTERY_ITEM) + .key('B', BATTERY_ITEM.get()) .key('I', Tags.Items.INGOTS_IRON) .key('E', ELECTROTINE_ALLOY_INGOT_TAG) .patternLine("SCS") .patternLine("WBW") .patternLine("IEI"); - shapedRecipe(AUTO_CRAFTER_BLOCK, 1) + shapedRecipe(AUTO_CRAFTER_BLOCK.get(), 1) .key('S', Tags.Items.STONE) .key('B', Blocks.CRAFTING_TABLE) .key('I', Tags.Items.INGOTS_IRON) @@ -75,7 +76,7 @@ protected void registerRecipes() { .patternLine("ICI") .patternLine("WEW"); - shapedRecipe(FIRE_STARTER_BLOCK, 1) + shapedRecipe(FIRE_STARTER_BLOCK.get(), 1) .key('N', Blocks.NETHERRACK) .key('F', Items.FLINT_AND_STEEL) .key('C', Blocks.COBBLESTONE) @@ -84,21 +85,21 @@ protected void registerRecipes() { .patternLine("CFC") .patternLine("CRC"); - shapedRecipe(FRAME_MOTOR_BLOCK, 1) + shapedRecipe(FRAME_MOTOR_BLOCK.get(), 1) .key('W', ItemTags.PLANKS) .key('I', Tags.Items.INGOTS_IRON) .key('R', Tags.Items.DUSTS_REDSTONE) - .key('M', MOTOR_ITEM) + .key('M', MOTOR_ITEM.get()) .key('S', Tags.Items.STONE) .key('E', ELECTROTINE_ALLOY_INGOT_TAG) .patternLine("WIW") .patternLine("RMR") .patternLine("SES"); - shapedRecipe(FRAME_ACTUATOR_BLOCK, 1) + shapedRecipe(FRAME_ACTUATOR_BLOCK.get(), 1) .key('W', ItemTags.PLANKS) .key('I', Tags.Items.INGOTS_IRON) - .key('C', COPPER_COIL_ITEM) + .key('C', COPPER_COIL_ITEM.get()) .key('S', Tags.Items.STONE) .key('E', ELECTROTINE_ALLOY_INGOT_TAG) .patternLine("WIW") @@ -106,7 +107,7 @@ protected void registerRecipes() { .patternLine("SES"); // Items - shapedRecipe(BATTERY_ITEM, 1) + shapedRecipe(BATTERY_ITEM.get(), 1) .key('E', ELECTROTINE_DUST_TAG) .key('T', TIN_INGOT_TAG) .key('C', INGOTS_COPPER) @@ -114,14 +115,14 @@ protected void registerRecipes() { .patternLine("ECE") .patternLine("ETE"); - shapelessRecipe(RECIPE_PLAN_ITEM, 1) + shapelessRecipe(RECIPE_PLAN_ITEM.get(), 1) .addIngredient(Tags.Items.DYES_BLUE) .addIngredient(Items.PAPER); - shapedRecipe(ELECTRIC_SCREWDRIVER_ITEM, 1) + shapedRecipe(ELECTRIC_SCREWDRIVER_ITEM.get(), 1) .key('I', Tags.Items.INGOTS_IRON) .key('S', SAPPHIRE_GEM_TAG) - .key('B', BATTERY_ITEM) + .key('B', BATTERY_ITEM.get()) .patternLine("I ") .patternLine(" S ") .patternLine(" B"); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionBlocks.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionBlocks.java index e87bbc384..a7d586c87 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionBlocks.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionBlocks.java @@ -4,12 +4,13 @@ import mrtjp.projectred.expansion.tile.*; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.expansion.ProjectRedExpansion.*; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; -@SuppressWarnings("DataFlowIssue") +@SuppressWarnings({ "DataFlowIssue", "NotNullFieldNotInitialized" }) public class ExpansionBlocks { public static final String ID_PROJECT_BENCH = "project_bench"; @@ -24,47 +25,70 @@ public class ExpansionBlocks { // public static final String ID_INDUCTION_FURNACE = "induction_furnace"; // public static final String ID_TELEPOSER = "teleposer"; + // Blocks + public static RegistryObject FRAME_BLOCK; + + public static RegistryObject PROJECT_BENCH_BLOCK; + public static RegistryObject BATTERY_BOX_BLOCK; + public static RegistryObject CHARGING_BENCH_BLOCK; + public static RegistryObject AUTO_CRAFTER_BLOCK; + public static RegistryObject FIRE_STARTER_BLOCK; + public static RegistryObject FRAME_MOTOR_BLOCK; + public static RegistryObject FRAME_ACTUATOR_BLOCK; +// // public static Block INDUCTION_FURNACE_BLOCK; +// // public static Block TELEPOSER_BLOCK; + + // Tiles + public static RegistryObject> PROJECT_BENCH_TILE; + public static RegistryObject> BATTERY_BOX_TILE; + public static RegistryObject> CHARGING_BENCH_TILE; + public static RegistryObject> AUTO_CRAFTER_TILE; + public static RegistryObject> FIRE_STARTER_TILE; + public static RegistryObject> FRAME_MOTOR_TILE; + public static RegistryObject> FRAME_ACTUATOR_TILE; + + public static void register() { /* Entity Blocks */ // Blocks - BLOCKS.register(ID_PROJECT_BENCH, ProjectBenchBlock::new); - BLOCKS.register(ID_BATTERY_BOX, BatteryBoxBlock::new); - BLOCKS.register(ID_AUTO_CRAFTER, AutoCrafterBlock::new); - BLOCKS.register(ID_CHARGING_BENCH, ChargingBenchBlock::new); - BLOCKS.register(ID_FIRE_STARTER, FireStarterBlock::new); - BLOCKS.register(ID_FRAME_MOTOR, FrameMotorBlock::new); - BLOCKS.register(ID_FRAME_ACTUATOR, FrameActuatorBlock::new); + PROJECT_BENCH_BLOCK = BLOCKS.register(ID_PROJECT_BENCH, ProjectBenchBlock::new); + BATTERY_BOX_BLOCK = BLOCKS.register(ID_BATTERY_BOX, BatteryBoxBlock::new); + CHARGING_BENCH_BLOCK = BLOCKS.register(ID_CHARGING_BENCH, ChargingBenchBlock::new); + AUTO_CRAFTER_BLOCK = BLOCKS.register(ID_AUTO_CRAFTER, AutoCrafterBlock::new); + FIRE_STARTER_BLOCK = BLOCKS.register(ID_FIRE_STARTER, FireStarterBlock::new); + FRAME_MOTOR_BLOCK = BLOCKS.register(ID_FRAME_MOTOR, FrameMotorBlock::new); + FRAME_ACTUATOR_BLOCK = BLOCKS.register(ID_FRAME_ACTUATOR, FrameActuatorBlock::new); // BLOCKS.register(ID_INDUCTION_FURNACE, InductionFurnaceBlock::new); // BLOCKS.register(ID_TELEPOSER, TeleposerBlock::new); // Block Items - ITEMS.register(ID_PROJECT_BENCH, () -> new BlockItem(PROJECT_BENCH_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_BATTERY_BOX, () -> new BlockItem(BATTERY_BOX_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_AUTO_CRAFTER, () -> new BlockItem(AUTO_CRAFTER_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_CHARGING_BENCH, () -> new BlockItem(CHARGING_BENCH_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_FIRE_STARTER, () -> new BlockItem(FIRE_STARTER_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_FRAME_MOTOR, () -> new BlockItem(FRAME_MOTOR_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); - ITEMS.register(ID_FRAME_ACTUATOR, () -> new BlockItem(FRAME_ACTUATOR_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_PROJECT_BENCH, () -> new BlockItem(PROJECT_BENCH_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_BATTERY_BOX, () -> new BlockItem(BATTERY_BOX_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_AUTO_CRAFTER, () -> new BlockItem(AUTO_CRAFTER_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_CHARGING_BENCH, () -> new BlockItem(CHARGING_BENCH_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_FIRE_STARTER, () -> new BlockItem(FIRE_STARTER_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_FRAME_MOTOR, () -> new BlockItem(FRAME_MOTOR_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_FRAME_ACTUATOR, () -> new BlockItem(FRAME_ACTUATOR_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); // ITEMS.register(ID_INDUCTION_FURNACE, () -> new BlockItem(INDUCTION_FURNACE_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); // ITEMS.register(ID_TELEPOSER, () -> new BlockItem(TELEPOSER_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); // Tiles - BLOCK_ENTITIES.register(ID_PROJECT_BENCH, () -> BlockEntityType.Builder.of(ProjectBenchTile::new, PROJECT_BENCH_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_BATTERY_BOX, () -> BlockEntityType.Builder.of(BatteryBoxTile::new, BATTERY_BOX_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_AUTO_CRAFTER, () -> BlockEntityType.Builder.of(AutoCrafterTile::new, AUTO_CRAFTER_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_CHARGING_BENCH, () -> BlockEntityType.Builder.of(ChargingBenchTile::new, CHARGING_BENCH_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_FIRE_STARTER, () -> BlockEntityType.Builder.of(FireStarterTile::new, FIRE_STARTER_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_FRAME_MOTOR, () -> BlockEntityType.Builder.of(FrameMotorTile::new, FRAME_MOTOR_BLOCK).build(null)); - BLOCK_ENTITIES.register(ID_FRAME_ACTUATOR, () -> BlockEntityType.Builder.of(FrameActuatorTile::new, FRAME_ACTUATOR_BLOCK).build(null)); + PROJECT_BENCH_TILE = BLOCK_ENTITY_TYPES.register(ID_PROJECT_BENCH, () -> BlockEntityType.Builder.of(ProjectBenchTile::new, PROJECT_BENCH_BLOCK.get()).build(null)); + BATTERY_BOX_TILE = BLOCK_ENTITY_TYPES.register(ID_BATTERY_BOX, () -> BlockEntityType.Builder.of(BatteryBoxTile::new, BATTERY_BOX_BLOCK.get()).build(null)); + CHARGING_BENCH_TILE = BLOCK_ENTITY_TYPES.register(ID_CHARGING_BENCH, () -> BlockEntityType.Builder.of(ChargingBenchTile::new, CHARGING_BENCH_BLOCK.get()).build(null)); + AUTO_CRAFTER_TILE = BLOCK_ENTITY_TYPES.register(ID_AUTO_CRAFTER, () -> BlockEntityType.Builder.of(AutoCrafterTile::new, AUTO_CRAFTER_BLOCK.get()).build(null)); + FIRE_STARTER_TILE = BLOCK_ENTITY_TYPES.register(ID_FIRE_STARTER, () -> BlockEntityType.Builder.of(FireStarterTile::new, FIRE_STARTER_BLOCK.get()).build(null)); + FRAME_MOTOR_TILE = BLOCK_ENTITY_TYPES.register(ID_FRAME_MOTOR, () -> BlockEntityType.Builder.of(FrameMotorTile::new, FRAME_MOTOR_BLOCK.get()).build(null)); + FRAME_ACTUATOR_TILE = BLOCK_ENTITY_TYPES.register(ID_FRAME_ACTUATOR, () -> BlockEntityType.Builder.of(FrameActuatorTile::new, FRAME_ACTUATOR_BLOCK.get()).build(null)); // TILE_ENTITIES.register(ID_INDUCTION_FURNACE, () -> TileEntityType.Builder.of(InductionFurnaceTile::new, INDUCTION_FURNACE_BLOCK).build(null)); // TILE_ENTITIES.register(ID_TELEPOSER, () -> TileEntityType.Builder.of(TeleposerTile::new, TELEPOSER_BLOCK).build(null)); /* Blocks */ - BLOCKS.register(ID_FRAME, FrameBlock::new); + FRAME_BLOCK = BLOCKS.register(ID_FRAME, FrameBlock::new); - ITEMS.register(ID_FRAME, () -> new BlockItem(FRAME_BLOCK, new Item.Properties().tab(EXPANSION_GROUP))); + ITEMS.register(ID_FRAME, () -> new BlockItem(FRAME_BLOCK.get(), new Item.Properties().tab(EXPANSION_GROUP))); } } \ No newline at end of file diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java index e11161092..85a015c89 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionClientInit.java @@ -24,7 +24,10 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; -import static mrtjp.projectred.expansion.init.ExpansionReferences.*; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; +import static mrtjp.projectred.expansion.init.ExpansionItems.RECIPE_PLAN_ITEM; +import static mrtjp.projectred.expansion.init.ExpansionMenus.*; +import static mrtjp.projectred.expansion.init.ExpansionParts.FRAME_PART; @SuppressWarnings("DataFlowIssue") public class ExpansionClientInit { @@ -50,37 +53,37 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { // Register screens - MenuScreens.register(PROJECT_BENCH_CONTAINER, ProjectBenchScreen::new); - MenuScreens.register(BATTERY_BOX_CONTAINER, BatteryBoxScreen::new); - MenuScreens.register(AUTO_CRAFTER_CONTAINER, AutoCrafterScreen::new); - MenuScreens.register(CHARGING_BENCH_CONTAINER, ChargingBenchScreen::new); + MenuScreens.register(PROJECT_BENCH_CONTAINER.get(), ProjectBenchScreen::new); + MenuScreens.register(BATTERY_BOX_CONTAINER.get(), BatteryBoxScreen::new); + MenuScreens.register(AUTO_CRAFTER_CONTAINER.get(), AutoCrafterScreen::new); + MenuScreens.register(CHARGING_BENCH_CONTAINER.get(), ChargingBenchScreen::new); // Register item model properties addItemModelProperties(); // Register block renderers - ItemBlockRenderTypes.setRenderLayer(FRAME_BLOCK, RenderType.cutout()); - BlockRenderingRegistry.registerRenderer(FRAME_BLOCK, FrameBlockRenderer.INSTANCE); - ItemBlockRenderTypes.setRenderLayer(FRAME_MOTOR_BLOCK, RenderType.solid()); - BlockRenderingRegistry.registerRenderer(FRAME_MOTOR_BLOCK, FrameMotorBlockRenderer.INSTANCE); + ItemBlockRenderTypes.setRenderLayer(FRAME_BLOCK.get(), RenderType.cutout()); + BlockRenderingRegistry.registerRenderer(FRAME_BLOCK.get(), FrameBlockRenderer.INSTANCE); + ItemBlockRenderTypes.setRenderLayer(FRAME_MOTOR_BLOCK.get(), RenderType.solid()); + BlockRenderingRegistry.registerRenderer(FRAME_MOTOR_BLOCK.get(), FrameMotorBlockRenderer.INSTANCE); BlockRenderingRegistry.registerGlobalRenderer(MovingBlockSuppressorRenderer.INSTANCE); // Register item renderers - MODEL_HELPER.register(new ModelResourceLocation(FRAME_BLOCK.getRegistryName(), "inventory"), FrameBlockRenderer.INSTANCE); - MODEL_HELPER.register(new ModelResourceLocation(FRAME_MOTOR_BLOCK.getRegistryName(), "inventory"), FrameMotorBlockRenderer.INSTANCE); + MODEL_HELPER.register(new ModelResourceLocation(FRAME_BLOCK.get().getRegistryName(), "inventory"), FrameBlockRenderer.INSTANCE); + MODEL_HELPER.register(new ModelResourceLocation(FRAME_MOTOR_BLOCK.get().getRegistryName(), "inventory"), FrameMotorBlockRenderer.INSTANCE); // Register part renderers - MultipartClientRegistry.register(FRAME_PART, FramePartRenderer.INSTANCE); + MultipartClientRegistry.register(FRAME_PART.get(), FramePartRenderer.INSTANCE); } private static void addItemModelProperties() { - ItemProperties.register(BATTERY_BOX_BLOCK.asItem(), ITEM_MODEL_PROPERTY_CHARGE_LEVEL, (stack, world, entity, seed) -> { + ItemProperties.register(BATTERY_BOX_BLOCK.get().asItem(), ITEM_MODEL_PROPERTY_CHARGE_LEVEL, (stack, world, entity, seed) -> { if (stack.hasTag()) { return stack.getTag().getInt(BatteryBoxTile.TAG_KEY_CHARGE_LEVEL_STATE); } return 0.0F; }); - ItemProperties.register(RECIPE_PLAN_ITEM, ITEM_MODEL_PROPERTY_WRITTEN_RECIPE_PLAN, (stack, world, entity, seed) -> RecipePlanItem.hasRecipeInside(stack) ? 1.0F : 0.0F); + ItemProperties.register(RECIPE_PLAN_ITEM.get(), ITEM_MODEL_PROPERTY_WRITTEN_RECIPE_PLAN, (stack, world, entity, seed) -> RecipePlanItem.hasRecipeInside(stack) ? 1.0F : 0.0F); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionContainers.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionContainers.java deleted file mode 100644 index cadaf320d..000000000 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionContainers.java +++ /dev/null @@ -1,21 +0,0 @@ -package mrtjp.projectred.expansion.init; - -import codechicken.lib.inventory.container.ICCLContainerType; -import mrtjp.projectred.expansion.inventory.container.AutoCrafterContainer; -import mrtjp.projectred.expansion.inventory.container.BatteryBoxContainer; -import mrtjp.projectred.expansion.inventory.container.ChargingBenchContainer; -import mrtjp.projectred.expansion.inventory.container.ProjectBenchContainer; - -import static mrtjp.projectred.expansion.ProjectRedExpansion.CONTAINERS; -import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; - -public class ExpansionContainers { - - public static void register() { - - CONTAINERS.register(ID_PROJECT_BENCH, () -> ICCLContainerType.create(ProjectBenchContainer.FACTORY)); - CONTAINERS.register(ID_BATTERY_BOX, () -> ICCLContainerType.create(BatteryBoxContainer.FACTORY)); - CONTAINERS.register(ID_AUTO_CRAFTER, () -> ICCLContainerType.create(AutoCrafterContainer.FACTORY)); - CONTAINERS.register(ID_CHARGING_BENCH, () -> ICCLContainerType.create(ChargingBenchContainer.FACTORY)); - } -} diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionItems.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionItems.java index e14cf6936..f41a4198b 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionItems.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionItems.java @@ -4,9 +4,12 @@ import mrtjp.projectred.expansion.item.ElectricScrewdriverItem; import mrtjp.projectred.expansion.item.EmptyBatteryItem; import mrtjp.projectred.expansion.item.RecipePlanItem; +import net.minecraft.world.item.Item; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.expansion.ProjectRedExpansion.ITEMS; +@SuppressWarnings("NotNullFieldNotInitialized") public class ExpansionItems { public static final String ID_RECIPE_PLAN = "recipe_plan"; @@ -14,11 +17,17 @@ public class ExpansionItems { public static final String ID_EMPTY_BATTERY = "empty_battery"; public static final String ID_ELECTRIC_SCREWDRIVER = "electric_screwdriver"; + public static RegistryObject RECIPE_PLAN_ITEM; + public static RegistryObject BATTERY_ITEM; + public static RegistryObject EMPTY_BATTERY_ITEM; + public static RegistryObject ELECTRIC_SCREWDRIVER_ITEM; + + public static void register() { - ITEMS.register(ID_RECIPE_PLAN, RecipePlanItem::new); - ITEMS.register(ID_BATTERY, BatteryItem::new); - ITEMS.register(ID_EMPTY_BATTERY, EmptyBatteryItem::new); - ITEMS.register(ID_ELECTRIC_SCREWDRIVER, ElectricScrewdriverItem::new); + RECIPE_PLAN_ITEM = ITEMS.register(ID_RECIPE_PLAN, RecipePlanItem::new); + BATTERY_ITEM = ITEMS.register(ID_BATTERY, BatteryItem::new); + EMPTY_BATTERY_ITEM = ITEMS.register(ID_EMPTY_BATTERY, EmptyBatteryItem::new); + ELECTRIC_SCREWDRIVER_ITEM = ITEMS.register(ID_ELECTRIC_SCREWDRIVER, ElectricScrewdriverItem::new); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionMenus.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionMenus.java new file mode 100644 index 000000000..150a18544 --- /dev/null +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionMenus.java @@ -0,0 +1,29 @@ +package mrtjp.projectred.expansion.init; + +import codechicken.lib.inventory.container.ICCLContainerType; +import mrtjp.projectred.expansion.inventory.container.AutoCrafterContainer; +import mrtjp.projectred.expansion.inventory.container.BatteryBoxContainer; +import mrtjp.projectred.expansion.inventory.container.ChargingBenchContainer; +import mrtjp.projectred.expansion.inventory.container.ProjectBenchContainer; +import net.minecraft.world.inventory.MenuType; +import net.minecraftforge.registries.RegistryObject; + +import static mrtjp.projectred.expansion.ProjectRedExpansion.MENU_TYPES; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; + +@SuppressWarnings("NotNullFieldNotInitialized") +public class ExpansionMenus { + + public static RegistryObject> PROJECT_BENCH_CONTAINER; + public static RegistryObject> BATTERY_BOX_CONTAINER; + public static RegistryObject> AUTO_CRAFTER_CONTAINER; + public static RegistryObject> CHARGING_BENCH_CONTAINER; + + public static void register() { + + PROJECT_BENCH_CONTAINER = MENU_TYPES.register(ID_PROJECT_BENCH, () -> ICCLContainerType.create(ProjectBenchContainer.FACTORY)); + BATTERY_BOX_CONTAINER = MENU_TYPES.register(ID_BATTERY_BOX, () -> ICCLContainerType.create(BatteryBoxContainer.FACTORY)); + AUTO_CRAFTER_CONTAINER = MENU_TYPES.register(ID_AUTO_CRAFTER, () -> ICCLContainerType.create(AutoCrafterContainer.FACTORY)); + CHARGING_BENCH_CONTAINER = MENU_TYPES.register(ID_CHARGING_BENCH, () -> ICCLContainerType.create(ChargingBenchContainer.FACTORY)); + } +} diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionParts.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionParts.java index e33d4ba17..7487bc28e 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionParts.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionParts.java @@ -1,19 +1,24 @@ package mrtjp.projectred.expansion.init; +import codechicken.multipart.api.MultipartType; import codechicken.multipart.api.SimpleMultipartType; import mrtjp.projectred.expansion.part.FramePart; import mrtjp.projectred.expansion.part.FramePartConverter; +import net.minecraftforge.registries.RegistryObject; -import static mrtjp.projectred.expansion.ProjectRedExpansion.PARTS; import static mrtjp.projectred.expansion.ProjectRedExpansion.PART_CONVERTERS; +import static mrtjp.projectred.expansion.ProjectRedExpansion.PART_TYPES; +@SuppressWarnings("NotNullFieldNotInitialized") public class ExpansionParts { public static final String ID_FRAME = "frame"; + public static RegistryObject> FRAME_PART; + public static void register() { - PARTS.register(ID_FRAME, () -> new SimpleMultipartType<>(c -> new FramePart())); + FRAME_PART = PART_TYPES.register(ID_FRAME, () -> new SimpleMultipartType<>(c -> new FramePart())); PART_CONVERTERS.register(ID_FRAME, () -> FramePartConverter.INSTANCE); } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionReferences.java b/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionReferences.java deleted file mode 100644 index 58b372d02..000000000 --- a/expansion/src/main/java/mrtjp/projectred/expansion/init/ExpansionReferences.java +++ /dev/null @@ -1,89 +0,0 @@ -package mrtjp.projectred.expansion.init; - -import codechicken.multipart.api.MultipartType; -import mrtjp.projectred.expansion.inventory.container.AutoCrafterContainer; -import mrtjp.projectred.expansion.inventory.container.BatteryBoxContainer; -import mrtjp.projectred.expansion.inventory.container.ChargingBenchContainer; -import mrtjp.projectred.expansion.inventory.container.ProjectBenchContainer; -import mrtjp.projectred.expansion.part.FramePart; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.ObjectHolder; - -import static mrtjp.projectred.expansion.ProjectRedExpansion.MOD_ID; -import static mrtjp.projectred.expansion.init.ExpansionBlocks.*; -import static mrtjp.projectred.expansion.init.ExpansionItems.*; - -@ObjectHolder(MOD_ID) -@SuppressWarnings("NotNullFieldNotInitialized") -public class ExpansionReferences { - - // Blocks - @ObjectHolder(ID_FRAME) - public static Block FRAME_BLOCK; - - @ObjectHolder(ID_PROJECT_BENCH) - public static Block PROJECT_BENCH_BLOCK; - @ObjectHolder(ID_BATTERY_BOX) - public static Block BATTERY_BOX_BLOCK; - @ObjectHolder(ID_CHARGING_BENCH) - public static Block CHARGING_BENCH_BLOCK; - @ObjectHolder(ID_AUTO_CRAFTER) - public static Block AUTO_CRAFTER_BLOCK; - @ObjectHolder(ID_FIRE_STARTER) - public static Block FIRE_STARTER_BLOCK; - @ObjectHolder(ID_FRAME_MOTOR) - public static Block FRAME_MOTOR_BLOCK; - @ObjectHolder(ID_FRAME_ACTUATOR) - public static Block FRAME_ACTUATOR_BLOCK; -// @ObjectHolder(ID_INDUCTION_FURNACE) -// public static Block INDUCTION_FURNACE_BLOCK; -// @ObjectHolder(ID_TELEPOSER) -// public static Block TELEPOSER_BLOCK; - - // Tiles - @ObjectHolder(ID_PROJECT_BENCH) - public static BlockEntityType PROJECT_BENCH_TILE; - @ObjectHolder(ID_BATTERY_BOX) - public static BlockEntityType BATTERY_BOX_TILE; - @ObjectHolder(ID_CHARGING_BENCH) - public static BlockEntityType CHARGING_BENCH_TILE; - @ObjectHolder(ID_AUTO_CRAFTER) - public static BlockEntityType AUTO_CRAFTER_TILE; - @ObjectHolder(ID_FIRE_STARTER) - public static BlockEntityType FIRE_STARTER_TILE; - @ObjectHolder(ID_FRAME_MOTOR) - public static BlockEntityType FRAME_MOTOR_TILE; - @ObjectHolder(ID_FRAME_ACTUATOR) - public static BlockEntityType FRAME_ACTUATOR_TILE; -// @ObjectHolder(ID_INDUCTION_FURNACE) -// public static TileEntityType INDUCTION_FURNACE_TILE; -// @ObjectHolder(ID_TELEPOSER) -// public static TileEntityType TELEPOSER_TILE; - - // Containers - @ObjectHolder(ID_PROJECT_BENCH) - public static MenuType PROJECT_BENCH_CONTAINER; - @ObjectHolder(ID_BATTERY_BOX) - public static MenuType BATTERY_BOX_CONTAINER; - @ObjectHolder(ID_AUTO_CRAFTER) - public static MenuType AUTO_CRAFTER_CONTAINER; - @ObjectHolder(ID_CHARGING_BENCH) - public static MenuType CHARGING_BENCH_CONTAINER; - - // Items - @ObjectHolder(ID_RECIPE_PLAN) - public static Item RECIPE_PLAN_ITEM; - @ObjectHolder(ID_BATTERY) - public static Item BATTERY_ITEM; - @ObjectHolder(ID_EMPTY_BATTERY) - public static Item EMPTY_BATTERY_ITEM; - @ObjectHolder(ID_ELECTRIC_SCREWDRIVER) - public static Item ELECTRIC_SCREWDRIVER_ITEM; - - // Parts - @ObjectHolder(ID_FRAME) - public static MultipartType FRAME_PART; -} diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/AutoCrafterContainer.java b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/AutoCrafterContainer.java index 304b3aebd..be08b7e32 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/AutoCrafterContainer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/AutoCrafterContainer.java @@ -2,7 +2,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.SimpleDataSlot; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionMenus; import mrtjp.projectred.expansion.item.RecipePlanItem; import mrtjp.projectred.expansion.tile.AutoCrafterTile; import mrtjp.projectred.lib.InventoryLib; @@ -27,7 +27,7 @@ public class AutoCrafterContainer extends BaseMachineContainer { private int planSlot; public AutoCrafterContainer(Inventory inventory, AutoCrafterTile tile, int windowId) { - super(ExpansionReferences.AUTO_CRAFTER_CONTAINER, windowId, tile); + super(ExpansionMenus.AUTO_CRAFTER_CONTAINER.get(), windowId, tile); this.playerInventory = inventory; this.tile = tile; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/BatteryBoxContainer.java b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/BatteryBoxContainer.java index e12a8db2e..2661659a8 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/BatteryBoxContainer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/BatteryBoxContainer.java @@ -3,7 +3,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.BasePoweredTileContainer; import mrtjp.projectred.core.inventory.container.SimpleDataSlot; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionMenus; import mrtjp.projectred.expansion.item.IChargable; import mrtjp.projectred.expansion.item.IRechargableBattery; import mrtjp.projectred.expansion.tile.BatteryBoxTile; @@ -30,7 +30,7 @@ public class BatteryBoxContainer extends BasePoweredTileContainer { protected int powerStored = 0; public BatteryBoxContainer(Inventory inventory, BatteryBoxTile tile, int windowId) { - super(ExpansionReferences.BATTERY_BOX_CONTAINER, windowId, tile); + super(ExpansionMenus.BATTERY_BOX_CONTAINER.get(), windowId, tile); this.playerInventory = inventory; this.tile = tile; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ChargingBenchContainer.java b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ChargingBenchContainer.java index 686e7074c..3738bef90 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ChargingBenchContainer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ChargingBenchContainer.java @@ -3,7 +3,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.BasePoweredTileContainer; import mrtjp.projectred.core.inventory.container.SimpleDataSlot; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionMenus; import mrtjp.projectred.expansion.item.IChargable; import mrtjp.projectred.expansion.tile.ChargingBenchTile; import mrtjp.projectred.lib.InventoryLib; @@ -29,7 +29,7 @@ public class ChargingBenchContainer extends BasePoweredTileContainer { protected int powerStored = 0; public ChargingBenchContainer(Inventory inventory, ChargingBenchTile tile, int windowId) { - super(ExpansionReferences.CHARGING_BENCH_CONTAINER, windowId, tile); + super(ExpansionMenus.CHARGING_BENCH_CONTAINER.get(), windowId, tile); this.playerInventory = inventory; this.tile = tile; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ProjectBenchContainer.java b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ProjectBenchContainer.java index 3bfbead07..c826da88f 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ProjectBenchContainer.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/inventory/container/ProjectBenchContainer.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.inventory.container; import codechicken.lib.inventory.container.ICCLContainerFactory; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionMenus; import mrtjp.projectred.expansion.item.RecipePlanItem; import mrtjp.projectred.expansion.tile.ProjectBenchTile; import mrtjp.projectred.lib.InventoryLib; @@ -26,7 +26,7 @@ public class ProjectBenchContainer extends AbstractContainerMenu { private final Inventory playerInventory; public ProjectBenchContainer(Inventory playerInventory, ProjectBenchTile tile, int windowId) { - super(ExpansionReferences.PROJECT_BENCH_CONTAINER, windowId); + super(ExpansionMenus.PROJECT_BENCH_CONTAINER.get(), windowId); this.playerInventory = playerInventory; this.tile = tile; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/item/BatteryItem.java b/expansion/src/main/java/mrtjp/projectred/expansion/item/BatteryItem.java index bf4a164c9..3a5b11c9a 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/item/BatteryItem.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/item/BatteryItem.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.item; import mrtjp.projectred.expansion.ProjectRedExpansion; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionItems; import net.minecraft.world.item.Item; public class BatteryItem extends Item implements IRechargableBattery { @@ -20,6 +20,6 @@ public Item getChargedVariant() { @Override public Item getEmptyVariant() { - return ExpansionReferences.EMPTY_BATTERY_ITEM; + return ExpansionItems.EMPTY_BATTERY_ITEM.get(); } } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/item/EmptyBatteryItem.java b/expansion/src/main/java/mrtjp/projectred/expansion/item/EmptyBatteryItem.java index 516e4b031..1a911eb8c 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/item/EmptyBatteryItem.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/item/EmptyBatteryItem.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.item; import mrtjp.projectred.expansion.ProjectRedExpansion; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionItems; import net.minecraft.world.item.Item; public class EmptyBatteryItem extends Item implements IRechargableBattery { @@ -12,7 +12,7 @@ public EmptyBatteryItem() { @Override public Item getChargedVariant() { - return ExpansionReferences.BATTERY_ITEM; + return ExpansionItems.BATTERY_ITEM.get(); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePart.java b/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePart.java index db7b50c3a..d295b3cef 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePart.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePart.java @@ -14,7 +14,7 @@ import mrtjp.projectred.api.Frame; import mrtjp.projectred.expansion.block.FrameBlock; import mrtjp.projectred.expansion.client.FrameModelRenderer; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionParts; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -32,7 +32,7 @@ import java.util.Collections; -import static mrtjp.projectred.expansion.init.ExpansionReferences.FRAME_BLOCK; +import static mrtjp.projectred.expansion.init.ExpansionBlocks.FRAME_BLOCK; public class FramePart extends BaseMultipart implements NormalOcclusionPart, IconHitEffectsPart, Frame { @@ -122,28 +122,28 @@ public void onMoved() { //region MultiPart properties @Override public MultipartType getType() { - return ExpansionReferences.FRAME_PART; + return ExpansionParts.FRAME_PART.get(); } @Override public float getStrength(Player player, PartRayTraceResult hit) { - return FRAME_BLOCK.defaultBlockState() + return FRAME_BLOCK.get().defaultBlockState() .getDestroyProgress(player, player.level, new BlockPos(0, -1, 0)); } @Override public @Nullable SoundType getPlacementSound(UseOnContext context) { - return FRAME_BLOCK.defaultBlockState().getSoundType(); + return FRAME_BLOCK.get().defaultBlockState().getSoundType(); } @Override public ItemStack getCloneStack(PartRayTraceResult hit) { - return new ItemStack(FRAME_BLOCK); + return new ItemStack(FRAME_BLOCK.get()); } @Override public Iterable getDrops() { - return Collections.singleton(new ItemStack(FRAME_BLOCK)); + return Collections.singleton(new ItemStack(FRAME_BLOCK.get())); } //endregion diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePartConverter.java b/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePartConverter.java index 8fc31ace6..051aa65ab 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePartConverter.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/part/FramePartConverter.java @@ -3,7 +3,7 @@ import codechicken.multipart.api.PartConverter; import codechicken.multipart.api.part.MultiPart; import codechicken.multipart.util.MultipartPlaceContext; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.state.BlockState; @@ -20,7 +20,7 @@ private FramePartConverter() { @Override public ConversionResult> convert(LevelAccessor world, BlockPos pos, BlockState state) { - if (state == ExpansionReferences.FRAME_BLOCK.defaultBlockState()) { + if (state == ExpansionBlocks.FRAME_BLOCK.get().defaultBlockState()) { return ConversionResult.success(Collections.singleton(new FramePart())); } return emptyResultList(); @@ -28,7 +28,7 @@ public ConversionResult> convert(LevelAccessor world, Bloc @Override public ConversionResult convert(MultipartPlaceContext context) { - if (context.getItemInHand().getItem() == ExpansionReferences.FRAME_BLOCK.asItem()) { + if (context.getItemInHand().getItem() == ExpansionBlocks.FRAME_BLOCK.get().asItem()) { return ConversionResult.success(new FramePart()); } return emptyResult(); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/AutoCrafterTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/AutoCrafterTile.java index 954087590..e5988cb7b 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/AutoCrafterTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/AutoCrafterTile.java @@ -5,7 +5,7 @@ import codechicken.lib.vec.Vector3; import mrtjp.projectred.core.inventory.BaseInventory; import mrtjp.projectred.expansion.CraftingHelper; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.inventory.container.AutoCrafterContainer; import mrtjp.projectred.expansion.item.RecipePlanItem; import net.minecraft.core.BlockPos; @@ -40,7 +40,7 @@ public boolean canPlaceItem(int slot, ItemStack stack) { private int idleTicksOnPlan = 0; public AutoCrafterTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.AUTO_CRAFTER_TILE, pos, state); + super(ExpansionBlocks.AUTO_CRAFTER_TILE.get(), pos, state); planInventory.addListener(this::onInventoryChanged); storageInventory.addListener(this::onInventoryChanged); } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseDeviceTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseDeviceTile.java index b19de9756..02db25604 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseDeviceTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseDeviceTile.java @@ -120,8 +120,7 @@ public InteractionResult onBlockActivated(Player player, InteractionHand hand, B ItemStack held = player.getItemInHand(hand); // Try to rotate block - if (held.getItem() instanceof IScrewdriver) { - IScrewdriver screwdriver = (IScrewdriver) held.getItem(); + if (held.getItem() instanceof IScrewdriver screwdriver) { if (screwdriver.canUse(player, held)) { if (!level.isClientSide) { side = (side + 1) % 6; diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseMachineTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseMachineTile.java index b5dd1cc11..ccbb5a74d 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseMachineTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BaseMachineTile.java @@ -102,8 +102,7 @@ public InteractionResult onBlockActivated(Player player, InteractionHand hand, B ItemStack held = player.getItemInHand(hand); // Try to rotate block - if (held.getItem() instanceof IScrewdriver) { - IScrewdriver screwdriver = (IScrewdriver) held.getItem(); + if (held.getItem() instanceof IScrewdriver screwdriver) { if (screwdriver.canUse(player, held)) { if (!level.isClientSide) { diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BatteryBoxTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BatteryBoxTile.java index 66848a2b5..06bdd1576 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/BatteryBoxTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/BatteryBoxTile.java @@ -6,7 +6,7 @@ import codechicken.lib.vec.Vector3; import mrtjp.projectred.core.inventory.BaseInventory; import mrtjp.projectred.expansion.block.BatteryBoxBlock; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.inventory.container.BatteryBoxContainer; import mrtjp.projectred.expansion.item.IChargable; import mrtjp.projectred.expansion.item.IRechargableBattery; @@ -32,7 +32,6 @@ import java.util.Objects; import static mrtjp.projectred.expansion.ProjectRedExpansion.LOGGER; -import static mrtjp.projectred.expansion.init.ExpansionReferences.BATTERY_BOX_BLOCK; public class BatteryBoxTile extends LowLoadPoweredTile { @@ -45,7 +44,7 @@ public class BatteryBoxTile extends LowLoadPoweredTile { private int powerStored = 0; public BatteryBoxTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.BATTERY_BOX_TILE, pos, state); + super(ExpansionBlocks.BATTERY_BOX_TILE.get(), pos, state); inventory.addListener(c -> setChanged()); } @@ -103,7 +102,7 @@ public void onBlockRemoved() { } public ItemStack createStackWithStoredPower() { - ItemStack stack = new ItemStack(BATTERY_BOX_BLOCK, 1); + ItemStack stack = new ItemStack(ExpansionBlocks.BATTERY_BOX_BLOCK.get(), 1); if (powerStored > 0) { CompoundTag tag = stack.getOrCreateTag(); tag.putInt(TAG_KEY_POWER_STORED, powerStored); diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/ChargingBenchTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/ChargingBenchTile.java index b1fd9bf21..1c470dc6d 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/ChargingBenchTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/ChargingBenchTile.java @@ -6,7 +6,7 @@ import codechicken.lib.vec.Vector3; import mrtjp.projectred.core.block.ProjectRedBlock; import mrtjp.projectred.core.inventory.BaseInventory; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.inventory.container.ChargingBenchContainer; import mrtjp.projectred.expansion.item.IChargable; import mrtjp.projectred.lib.InventoryLib; @@ -39,7 +39,7 @@ public class ChargingBenchTile extends LowLoadPoweredTile { private int powerStored = 0; public ChargingBenchTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.CHARGING_BENCH_TILE, pos, state); + super(ExpansionBlocks.CHARGING_BENCH_TILE.get(), pos, state); inventory.addListener(c -> setChanged()); } diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FireStarterTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FireStarterTile.java index e463444aa..6ec3ec5e3 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FireStarterTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FireStarterTile.java @@ -1,7 +1,7 @@ package mrtjp.projectred.expansion.tile; import codechicken.multipart.api.tile.RedstoneConnector; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; @@ -16,7 +16,7 @@ public class FireStarterTile extends BaseDeviceTile implements RedstoneConnector { public FireStarterTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.FIRE_STARTER_TILE, pos, state); + super(ExpansionBlocks.FIRE_STARTER_TILE.get(), pos, state); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameActuatorTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameActuatorTile.java index 41c132ad6..abcf6e153 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameActuatorTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameActuatorTile.java @@ -1,13 +1,13 @@ package mrtjp.projectred.expansion.tile; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; public class FrameActuatorTile extends BaseFrameMoverTile { public FrameActuatorTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.FRAME_ACTUATOR_TILE, pos, state); + super(ExpansionBlocks.FRAME_ACTUATOR_TILE.get(), pos, state); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameMotorTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameMotorTile.java index a0233eda4..0423b6fb7 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameMotorTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/FrameMotorTile.java @@ -1,14 +1,14 @@ package mrtjp.projectred.expansion.tile; import codechicken.lib.vec.Rotation; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; public class FrameMotorTile extends BaseFrameMoverTile { public FrameMotorTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.FRAME_MOTOR_TILE, pos, state); + super(ExpansionBlocks.FRAME_MOTOR_TILE.get(), pos, state); } @Override diff --git a/expansion/src/main/java/mrtjp/projectred/expansion/tile/ProjectBenchTile.java b/expansion/src/main/java/mrtjp/projectred/expansion/tile/ProjectBenchTile.java index e434041d4..cbc4f9964 100644 --- a/expansion/src/main/java/mrtjp/projectred/expansion/tile/ProjectBenchTile.java +++ b/expansion/src/main/java/mrtjp/projectred/expansion/tile/ProjectBenchTile.java @@ -8,7 +8,7 @@ import mrtjp.projectred.core.tile.IPacketReceiverTile; import mrtjp.projectred.core.tile.ProjectRedTile; import mrtjp.projectred.expansion.CraftingHelper; -import mrtjp.projectred.expansion.init.ExpansionReferences; +import mrtjp.projectred.expansion.init.ExpansionBlocks; import mrtjp.projectred.expansion.inventory.container.ProjectBenchContainer; import mrtjp.projectred.expansion.item.RecipePlanItem; import mrtjp.projectred.lib.InventoryLib; @@ -54,7 +54,7 @@ public boolean canPlaceItem(int slot, ItemStack stack) { private boolean recipeNeedsUpdate = true; public ProjectBenchTile(BlockPos pos, BlockState state) { - super(ExpansionReferences.PROJECT_BENCH_TILE, pos, state); + super(ExpansionBlocks.PROJECT_BENCH_TILE.get(), pos, state); planInventory.addListener(this::onInventoryChanged); craftingGrid.addListener(this::onInventoryChanged); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/ProjectRedExploration.java b/exploration/src/main/java/mrtjp/projectred/exploration/ProjectRedExploration.java index 4f8a624b4..4a8ede839 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/ProjectRedExploration.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/ProjectRedExploration.java @@ -27,7 +27,7 @@ import net.minecraftforge.registries.ForgeRegistries; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.MARBLE_BRICK_BLOCK; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.MARBLE_BRICK_BLOCK; @Mod(MOD_ID) public class ProjectRedExploration { @@ -36,17 +36,17 @@ public class ProjectRedExploration { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); + public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); public static final DeferredRegister> WORLD_CARVERS = DeferredRegister.create(ForgeRegistries.WORLD_CARVERS, MOD_ID); public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(ForgeRegistries.RECIPE_SERIALIZERS, MOD_ID); public static final DeferredRegister MICRO_MATERIALS = DeferredRegister.create(new ResourceLocation(CBMicroblock.MOD_ID, "micro_material"), MOD_ID); - public static final SimpleCreativeTab EXPLORATION_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(MARBLE_BRICK_BLOCK)); + public static final SimpleCreativeTab EXPLORATION_CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(MARBLE_BRICK_BLOCK.get())); static { ExplorationBlocks.register(); ExplorationItems.register(); - ExplorationContainers.register(); + ExplorationMenus.register(); ExplorationWorldFeatures.register(); ExplorationRecipeSerializers.register(); } @@ -62,7 +62,7 @@ public ProjectRedExploration() { BLOCKS.register(modEventBus); ITEMS.register(modEventBus); - CONTAINERS.register(modEventBus); + MENU_TYPES.register(modEventBus); WORLD_CARVERS.register(modEventBus); RECIPE_SERIALIZERS.register(modEventBus); MICRO_MATERIALS.register(modEventBus); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockStateModelProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockStateModelProvider.java index 25f29b72e..26dbc6a7a 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockStateModelProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockStateModelProvider.java @@ -7,7 +7,7 @@ import javax.annotation.Nonnull; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; public class ExplorationBlockStateModelProvider extends BlockStateProvider { @@ -25,43 +25,43 @@ public String getName() { protected void registerStatesAndModels() { // Ores - simpleBlock(RUBY_ORE_BLOCK); - simpleBlock(DEEPSLATE_RUBY_ORE_BLOCK); - simpleBlock(SAPPHIRE_ORE_BLOCK); - simpleBlock(DEEPSLATE_SAPPHIRE_ORE_BLOCK); - simpleBlock(PERIDOT_ORE_BLOCK); - simpleBlock(DEEPSLATE_PERIDOT_ORE_BLOCK); - simpleBlock(TIN_ORE_BLOCK); - simpleBlock(DEEPSLATE_TIN_ORE_BLOCK); - simpleBlock(SILVER_ORE_BLOCK); - simpleBlock(DEEPSLATE_SILVER_ORE_BLOCK); - simpleBlock(ELECTROTINE_ORE_BLOCK); - simpleBlock(DEEPSLATE_ELECTROTINE_ORE_BLOCK); + simpleBlock(RUBY_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_RUBY_ORE_BLOCK.get()); + simpleBlock(SAPPHIRE_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()); + simpleBlock(PERIDOT_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_PERIDOT_ORE_BLOCK.get()); + simpleBlock(TIN_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_TIN_ORE_BLOCK.get()); + simpleBlock(SILVER_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_SILVER_ORE_BLOCK.get()); + simpleBlock(ELECTROTINE_ORE_BLOCK.get()); + simpleBlock(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()); // Decorative blocks - simpleBlock(MARBLE_BLOCK); - simpleBlock(MARBLE_BRICK_BLOCK); - simpleBlock(BASALT_BLOCK); - simpleBlock(BASALT_COBBLE_BLOCK); - simpleBlock(BASALT_BRICK_BLOCK); - simpleBlock(RUBY_BLOCK); - simpleBlock(SAPPHIRE_BLOCK); - simpleBlock(PERIDOT_BLOCK); - simpleBlock(ELECTROTINE_BLOCK); - simpleBlock(RAW_TIN_BLOCK); - simpleBlock(RAW_SILVER_BLOCK); - simpleBlock(TIN_BLOCK); - simpleBlock(SILVER_BLOCK); + simpleBlock(MARBLE_BLOCK.get()); + simpleBlock(MARBLE_BRICK_BLOCK.get()); + simpleBlock(BASALT_BLOCK.get()); + simpleBlock(BASALT_COBBLE_BLOCK.get()); + simpleBlock(BASALT_BRICK_BLOCK.get()); + simpleBlock(RUBY_BLOCK.get()); + simpleBlock(SAPPHIRE_BLOCK.get()); + simpleBlock(PERIDOT_BLOCK.get()); + simpleBlock(ELECTROTINE_BLOCK.get()); + simpleBlock(RAW_TIN_BLOCK.get()); + simpleBlock(RAW_SILVER_BLOCK.get()); + simpleBlock(TIN_BLOCK.get()); + simpleBlock(SILVER_BLOCK.get()); // Walls - wallBlock(MARBLE_WALL, blockTexture(MARBLE_BLOCK)); - wallBlock(MARBLE_BRICK_WALL, blockTexture(MARBLE_BRICK_BLOCK)); - wallBlock(BASALT_WALL, blockTexture(BASALT_BLOCK)); - wallBlock(BASALT_COBBLE_WALL, blockTexture(BASALT_COBBLE_BLOCK)); - wallBlock(BASALT_BRICK_WALL, blockTexture(BASALT_BRICK_BLOCK)); - wallBlock(RUBY_BLOCK_WALL, blockTexture(RUBY_BLOCK)); - wallBlock(SAPPHIRE_BLOCK_WALL, blockTexture(SAPPHIRE_BLOCK)); - wallBlock(PERIDOT_BLOCK_WALL, blockTexture(PERIDOT_BLOCK)); - wallBlock(ELECTROTINE_BLOCK_WALL, blockTexture(ELECTROTINE_BLOCK)); + wallBlock(MARBLE_WALL.get(), blockTexture(MARBLE_BLOCK.get())); + wallBlock(MARBLE_BRICK_WALL.get(), blockTexture(MARBLE_BRICK_BLOCK.get())); + wallBlock(BASALT_WALL.get(), blockTexture(BASALT_BLOCK.get())); + wallBlock(BASALT_COBBLE_WALL.get(), blockTexture(BASALT_COBBLE_BLOCK.get())); + wallBlock(BASALT_BRICK_WALL.get(), blockTexture(BASALT_BRICK_BLOCK.get())); + wallBlock(RUBY_BLOCK_WALL.get(), blockTexture(RUBY_BLOCK.get())); + wallBlock(SAPPHIRE_BLOCK_WALL.get(), blockTexture(SAPPHIRE_BLOCK.get())); + wallBlock(PERIDOT_BLOCK_WALL.get(), blockTexture(PERIDOT_BLOCK.get())); + wallBlock(ELECTROTINE_BLOCK_WALL.get(), blockTexture(ELECTROTINE_BLOCK.get())); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockTagsProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockTagsProvider.java index 7b4d646eb..ca34e8e12 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockTagsProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationBlockTagsProvider.java @@ -9,7 +9,7 @@ import javax.annotation.Nullable; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; import static mrtjp.projectred.exploration.init.ExplorationTags.*; public class ExplorationBlockTagsProvider extends BlockTagsProvider { @@ -26,15 +26,15 @@ public String getName() { @Override protected void addTags() { tag(BlockTags.WALLS).add( - MARBLE_WALL, - MARBLE_BRICK_WALL, - BASALT_WALL, - BASALT_COBBLE_WALL, - BASALT_BRICK_WALL, - RUBY_BLOCK_WALL, - SAPPHIRE_BLOCK_WALL, - PERIDOT_BLOCK_WALL, - ELECTROTINE_BLOCK_WALL); + MARBLE_WALL.get(), + MARBLE_BRICK_WALL.get(), + BASALT_WALL.get(), + BASALT_COBBLE_WALL.get(), + BASALT_BRICK_WALL.get(), + RUBY_BLOCK_WALL.get(), + SAPPHIRE_BLOCK_WALL.get(), + PERIDOT_BLOCK_WALL.get(), + ELECTROTINE_BLOCK_WALL.get()); tag(Tags.Blocks.ORES) .addTag(RUBY_ORES_BLOCK_TAG) @@ -59,116 +59,116 @@ protected void addTags() { /* Attach blocks to tags */ tag(BlockTags.MINEABLE_WITH_PICKAXE) - .add(RUBY_ORE_BLOCK) - .add(DEEPSLATE_RUBY_ORE_BLOCK) - .add(SAPPHIRE_ORE_BLOCK) - .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK) - .add(PERIDOT_ORE_BLOCK) - .add(DEEPSLATE_PERIDOT_ORE_BLOCK) - .add(ELECTROTINE_ORE_BLOCK) - .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK) - .add(TIN_ORE_BLOCK) - .add(DEEPSLATE_TIN_ORE_BLOCK) - .add(SILVER_ORE_BLOCK) - .add(DEEPSLATE_SILVER_ORE_BLOCK) - .add(MARBLE_BLOCK) - .add(MARBLE_BRICK_BLOCK) - .add(BASALT_BLOCK) - .add(BASALT_COBBLE_BLOCK) - .add(RUBY_BLOCK) - .add(SAPPHIRE_BLOCK) - .add(PERIDOT_BLOCK) - .add(ELECTROTINE_BLOCK) - .add(RAW_TIN_BLOCK) - .add(TIN_BLOCK) - .add(RAW_SILVER_BLOCK) - .add(SILVER_BLOCK) - .add(MARBLE_WALL) - .add(MARBLE_BRICK_WALL) - .add(BASALT_WALL) - .add(BASALT_COBBLE_WALL) - .add(BASALT_BRICK_WALL) - .add(RUBY_BLOCK_WALL) - .add(SAPPHIRE_BLOCK_WALL) - .add(PERIDOT_BLOCK_WALL) - .add(ELECTROTINE_BLOCK_WALL); + .add(RUBY_ORE_BLOCK.get()) + .add(DEEPSLATE_RUBY_ORE_BLOCK.get()) + .add(SAPPHIRE_ORE_BLOCK.get()) + .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()) + .add(PERIDOT_ORE_BLOCK.get()) + .add(DEEPSLATE_PERIDOT_ORE_BLOCK.get()) + .add(ELECTROTINE_ORE_BLOCK.get()) + .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()) + .add(TIN_ORE_BLOCK.get()) + .add(DEEPSLATE_TIN_ORE_BLOCK.get()) + .add(SILVER_ORE_BLOCK.get()) + .add(DEEPSLATE_SILVER_ORE_BLOCK.get()) + .add(MARBLE_BLOCK.get()) + .add(MARBLE_BRICK_BLOCK.get()) + .add(BASALT_BLOCK.get()) + .add(BASALT_COBBLE_BLOCK.get()) + .add(RUBY_BLOCK.get()) + .add(SAPPHIRE_BLOCK.get()) + .add(PERIDOT_BLOCK.get()) + .add(ELECTROTINE_BLOCK.get()) + .add(RAW_TIN_BLOCK.get()) + .add(TIN_BLOCK.get()) + .add(RAW_SILVER_BLOCK.get()) + .add(SILVER_BLOCK.get()) + .add(MARBLE_WALL.get()) + .add(MARBLE_BRICK_WALL.get()) + .add(BASALT_WALL.get()) + .add(BASALT_COBBLE_WALL.get()) + .add(BASALT_BRICK_WALL.get()) + .add(RUBY_BLOCK_WALL.get()) + .add(SAPPHIRE_BLOCK_WALL.get()) + .add(PERIDOT_BLOCK_WALL.get()) + .add(ELECTROTINE_BLOCK_WALL.get()); tag(BlockTags.NEEDS_STONE_TOOL) // Ores - .add(TIN_ORE_BLOCK) - .add(DEEPSLATE_TIN_ORE_BLOCK) + .add(TIN_ORE_BLOCK.get()) + .add(DEEPSLATE_TIN_ORE_BLOCK.get()) // Decorative blocks - .add(MARBLE_BLOCK) - .add(MARBLE_BRICK_BLOCK) - .add(BASALT_BLOCK) - .add(BASALT_COBBLE_BLOCK) - .add(BASALT_BRICK_BLOCK) - .add(ELECTROTINE_BLOCK) - .add(RAW_TIN_BLOCK) - .add(TIN_BLOCK) + .add(MARBLE_BLOCK.get()) + .add(MARBLE_BRICK_BLOCK.get()) + .add(BASALT_BLOCK.get()) + .add(BASALT_COBBLE_BLOCK.get()) + .add(BASALT_BRICK_BLOCK.get()) + .add(ELECTROTINE_BLOCK.get()) + .add(RAW_TIN_BLOCK.get()) + .add(TIN_BLOCK.get()) // Walls - .add(MARBLE_WALL) - .add(MARBLE_BRICK_WALL) - .add(BASALT_WALL) - .add(BASALT_COBBLE_WALL) - .add(BASALT_BRICK_WALL) - .add(ELECTROTINE_BLOCK_WALL); + .add(MARBLE_WALL.get()) + .add(MARBLE_BRICK_WALL.get()) + .add(BASALT_WALL.get()) + .add(BASALT_COBBLE_WALL.get()) + .add(BASALT_BRICK_WALL.get()) + .add(ELECTROTINE_BLOCK_WALL.get()); tag(BlockTags.NEEDS_IRON_TOOL) // Ores - .add(RUBY_ORE_BLOCK) - .add(DEEPSLATE_RUBY_ORE_BLOCK) - .add(SAPPHIRE_ORE_BLOCK) - .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK) - .add(PERIDOT_ORE_BLOCK) - .add(DEEPSLATE_PERIDOT_ORE_BLOCK) - .add(ELECTROTINE_ORE_BLOCK) - .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK) - .add(SILVER_ORE_BLOCK) - .add(DEEPSLATE_SILVER_ORE_BLOCK) + .add(RUBY_ORE_BLOCK.get()) + .add(DEEPSLATE_RUBY_ORE_BLOCK.get()) + .add(SAPPHIRE_ORE_BLOCK.get()) + .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()) + .add(PERIDOT_ORE_BLOCK.get()) + .add(DEEPSLATE_PERIDOT_ORE_BLOCK.get()) + .add(ELECTROTINE_ORE_BLOCK.get()) + .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()) + .add(SILVER_ORE_BLOCK.get()) + .add(DEEPSLATE_SILVER_ORE_BLOCK.get()) // Decorative blocks - .add(RUBY_BLOCK) - .add(SAPPHIRE_BLOCK) - .add(PERIDOT_BLOCK) - .add(RAW_SILVER_BLOCK) - .add(SILVER_BLOCK) + .add(RUBY_BLOCK.get()) + .add(SAPPHIRE_BLOCK.get()) + .add(PERIDOT_BLOCK.get()) + .add(RAW_SILVER_BLOCK.get()) + .add(SILVER_BLOCK.get()) // Walls - .add(RUBY_BLOCK_WALL) - .add(SAPPHIRE_BLOCK_WALL) - .add(PERIDOT_BLOCK_WALL); + .add(RUBY_BLOCK_WALL.get()) + .add(SAPPHIRE_BLOCK_WALL.get()) + .add(PERIDOT_BLOCK_WALL.get()); - tag(RUBY_ORES_BLOCK_TAG).add(RUBY_ORE_BLOCK).add(DEEPSLATE_RUBY_ORE_BLOCK); - tag(SAPPHIRE_ORES_BLOCK_TAG).add(SAPPHIRE_ORE_BLOCK).add(DEEPSLATE_SAPPHIRE_ORE_BLOCK); - tag(PERIDOT_ORES_BLOCK_TAG).add(PERIDOT_ORE_BLOCK).add(DEEPSLATE_PERIDOT_ORE_BLOCK); - tag(TIN_ORES_BLOCK_TAG).add(TIN_ORE_BLOCK).add(DEEPSLATE_TIN_ORE_BLOCK); - tag(SILVER_ORES_BLOCK_TAG).add(SILVER_ORE_BLOCK).add(DEEPSLATE_SILVER_ORE_BLOCK); - tag(ELECTROTINE_ORES_BLOCK_TAG).add(ELECTROTINE_ORE_BLOCK).add(DEEPSLATE_ELECTROTINE_ORE_BLOCK); + tag(RUBY_ORES_BLOCK_TAG).add(RUBY_ORE_BLOCK.get()).add(DEEPSLATE_RUBY_ORE_BLOCK.get()); + tag(SAPPHIRE_ORES_BLOCK_TAG).add(SAPPHIRE_ORE_BLOCK.get()).add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()); + tag(PERIDOT_ORES_BLOCK_TAG).add(PERIDOT_ORE_BLOCK.get()).add(DEEPSLATE_PERIDOT_ORE_BLOCK.get()); + tag(TIN_ORES_BLOCK_TAG).add(TIN_ORE_BLOCK.get()).add(DEEPSLATE_TIN_ORE_BLOCK.get()); + tag(SILVER_ORES_BLOCK_TAG).add(SILVER_ORE_BLOCK.get()).add(DEEPSLATE_SILVER_ORE_BLOCK.get()); + tag(ELECTROTINE_ORES_BLOCK_TAG).add(ELECTROTINE_ORE_BLOCK.get()).add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()); tag(Tags.Blocks.ORES_IN_GROUND_STONE) - .add(RUBY_ORE_BLOCK) - .add(SAPPHIRE_ORE_BLOCK) - .add(PERIDOT_ORE_BLOCK) - .add(TIN_ORE_BLOCK) - .add(SILVER_ORE_BLOCK) - .add(ELECTROTINE_ORE_BLOCK); + .add(RUBY_ORE_BLOCK.get()) + .add(SAPPHIRE_ORE_BLOCK.get()) + .add(PERIDOT_ORE_BLOCK.get()) + .add(TIN_ORE_BLOCK.get()) + .add(SILVER_ORE_BLOCK.get()) + .add(ELECTROTINE_ORE_BLOCK.get()); tag(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE) - .add(DEEPSLATE_RUBY_ORE_BLOCK) - .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK) - .add(DEEPSLATE_PERIDOT_ORE_BLOCK) - .add(DEEPSLATE_TIN_ORE_BLOCK) - .add(DEEPSLATE_SILVER_ORE_BLOCK) - .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK); - - tag(MARBLE_BLOCK_TAG).add(MARBLE_BLOCK); - tag(BASALT_BLOCK_TAG).add(BASALT_BLOCK); - tag(RUBY_STORAGE_BLOCK_TAG).add(RUBY_BLOCK); - tag(SAPPHIRE_STORAGE_BLOCK_TAG).add(SAPPHIRE_BLOCK); - tag(PERIDOT_STORAGE_BLOCK_TAG).add(PERIDOT_BLOCK); - tag(ELECTROTINE_STORAGE_BLOCK_TAG).add(ELECTROTINE_BLOCK); - tag(RAW_TIN_STORAGE_BLOCK_TAG).add(RAW_TIN_BLOCK); - tag(TIN_STORAGE_BLOCK_TAG).add(TIN_BLOCK); - tag(RAW_SILVER_STORAGE_BLOCK_TAG).add(RAW_SILVER_BLOCK); - tag(SILVER_STORAGE_BLOCK_TAG).add(SILVER_BLOCK); + .add(DEEPSLATE_RUBY_ORE_BLOCK.get()) + .add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()) + .add(DEEPSLATE_PERIDOT_ORE_BLOCK.get()) + .add(DEEPSLATE_TIN_ORE_BLOCK.get()) + .add(DEEPSLATE_SILVER_ORE_BLOCK.get()) + .add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()); + + tag(MARBLE_BLOCK_TAG).add(MARBLE_BLOCK.get()); + tag(BASALT_BLOCK_TAG).add(BASALT_BLOCK.get()); + tag(RUBY_STORAGE_BLOCK_TAG).add(RUBY_BLOCK.get()); + tag(SAPPHIRE_STORAGE_BLOCK_TAG).add(SAPPHIRE_BLOCK.get()); + tag(PERIDOT_STORAGE_BLOCK_TAG).add(PERIDOT_BLOCK.get()); + tag(ELECTROTINE_STORAGE_BLOCK_TAG).add(ELECTROTINE_BLOCK.get()); + tag(RAW_TIN_STORAGE_BLOCK_TAG).add(RAW_TIN_BLOCK.get()); + tag(TIN_STORAGE_BLOCK_TAG).add(TIN_BLOCK.get()); + tag(RAW_SILVER_STORAGE_BLOCK_TAG).add(RAW_SILVER_BLOCK.get()); + tag(SILVER_STORAGE_BLOCK_TAG).add(SILVER_BLOCK.get()); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java index 3d6fc9549..427b4fad7 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java @@ -6,7 +6,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; +import static mrtjp.projectred.exploration.init.ExplorationItems.*; public class ExplorationItemModelProvider extends ItemModelProvider { @@ -25,44 +26,44 @@ protected void registerModels() { /* Block Items */ // Ore Blocks - simpleItemBlock(RUBY_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_RUBY_ORE_BLOCK); - simpleItemBlock(SAPPHIRE_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_SAPPHIRE_ORE_BLOCK); - simpleItemBlock(PERIDOT_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_PERIDOT_ORE_BLOCK); - simpleItemBlock(TIN_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_TIN_ORE_BLOCK); - simpleItemBlock(SILVER_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_SILVER_ORE_BLOCK); - simpleItemBlock(ELECTROTINE_ORE_BLOCK); - simpleItemBlock(DEEPSLATE_ELECTROTINE_ORE_BLOCK); + simpleItemBlock(RUBY_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_RUBY_ORE_BLOCK.get()); + simpleItemBlock(SAPPHIRE_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()); + simpleItemBlock(PERIDOT_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_PERIDOT_ORE_BLOCK.get()); + simpleItemBlock(TIN_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_TIN_ORE_BLOCK.get()); + simpleItemBlock(SILVER_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_SILVER_ORE_BLOCK.get()); + simpleItemBlock(ELECTROTINE_ORE_BLOCK.get()); + simpleItemBlock(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()); // Decorative Blocks - simpleItemBlock(MARBLE_BLOCK); - simpleItemBlock(MARBLE_BRICK_BLOCK); - simpleItemBlock(BASALT_BLOCK); - simpleItemBlock(BASALT_COBBLE_BLOCK); - simpleItemBlock(BASALT_BRICK_BLOCK); - simpleItemBlock(RUBY_BLOCK); - simpleItemBlock(SAPPHIRE_BLOCK); - simpleItemBlock(PERIDOT_BLOCK); - simpleItemBlock(ELECTROTINE_BLOCK); - simpleItemBlock(RAW_TIN_BLOCK); - simpleItemBlock(TIN_BLOCK); - simpleItemBlock(RAW_SILVER_BLOCK); - simpleItemBlock(SILVER_BLOCK); + simpleItemBlock(MARBLE_BLOCK.get()); + simpleItemBlock(MARBLE_BRICK_BLOCK.get()); + simpleItemBlock(BASALT_BLOCK.get()); + simpleItemBlock(BASALT_COBBLE_BLOCK.get()); + simpleItemBlock(BASALT_BRICK_BLOCK.get()); + simpleItemBlock(RUBY_BLOCK.get()); + simpleItemBlock(SAPPHIRE_BLOCK.get()); + simpleItemBlock(PERIDOT_BLOCK.get()); + simpleItemBlock(ELECTROTINE_BLOCK.get()); + simpleItemBlock(RAW_TIN_BLOCK.get()); + simpleItemBlock(TIN_BLOCK.get()); + simpleItemBlock(RAW_SILVER_BLOCK.get()); + simpleItemBlock(SILVER_BLOCK.get()); // Walls - wallItemBlock(MARBLE_WALL, MARBLE_BLOCK); - wallItemBlock(MARBLE_BRICK_WALL, MARBLE_BRICK_BLOCK); - wallItemBlock(BASALT_WALL, BASALT_BLOCK); - wallItemBlock(BASALT_COBBLE_WALL, BASALT_COBBLE_BLOCK); - wallItemBlock(BASALT_BRICK_WALL, BASALT_BRICK_BLOCK); - wallItemBlock(RUBY_BLOCK_WALL, RUBY_BLOCK); - wallItemBlock(SAPPHIRE_BLOCK_WALL, SAPPHIRE_BLOCK); - wallItemBlock(PERIDOT_BLOCK_WALL, PERIDOT_BLOCK); - wallItemBlock(ELECTROTINE_BLOCK_WALL, ELECTROTINE_BLOCK); + wallItemBlock(MARBLE_WALL.get(), MARBLE_BLOCK.get()); + wallItemBlock(MARBLE_BRICK_WALL.get(), MARBLE_BRICK_BLOCK.get()); + wallItemBlock(BASALT_WALL.get(), BASALT_BLOCK.get()); + wallItemBlock(BASALT_COBBLE_WALL.get(), BASALT_COBBLE_BLOCK.get()); + wallItemBlock(BASALT_BRICK_WALL.get(), BASALT_BRICK_BLOCK.get()); + wallItemBlock(RUBY_BLOCK_WALL.get(), RUBY_BLOCK.get()); + wallItemBlock(SAPPHIRE_BLOCK_WALL.get(), SAPPHIRE_BLOCK.get()); + wallItemBlock(PERIDOT_BLOCK_WALL.get(), PERIDOT_BLOCK.get()); + wallItemBlock(ELECTROTINE_BLOCK_WALL.get(), ELECTROTINE_BLOCK.get()); /* Items */ diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java index 084d84e76..1fba7ddd9 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java @@ -10,7 +10,8 @@ import static mrtjp.projectred.core.init.CoreTags.SILVER_INGOT_TAG; import static mrtjp.projectred.core.init.CoreTags.TIN_INGOT_TAG; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; +import static mrtjp.projectred.exploration.init.ExplorationItems.*; import static mrtjp.projectred.exploration.init.ExplorationTags.*; public class ExplorationItemTagsProvider extends ItemTagsProvider { @@ -71,42 +72,42 @@ protected void addTags() { /* Attach items to tags */ //Note: Defined in Core - tag(TIN_INGOT_TAG).add(TIN_INGOT_ITEM); - tag(SILVER_INGOT_TAG).add(SILVER_INGOT_ITEM); - - tag(RUBY_ORES_BLOCK_ITEM_TAG).add(RUBY_ORE_BLOCK.asItem()).add(DEEPSLATE_RUBY_ORE_BLOCK.asItem()); - tag(SAPPHIRE_ORES_BLOCK_ITEM_TAG).add(SAPPHIRE_ORE_BLOCK.asItem()).add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.asItem()); - tag(PERIDOT_ORES_BLOCK_ITEM_TAG).add(PERIDOT_ORE_BLOCK.asItem()).add(DEEPSLATE_PERIDOT_ORE_BLOCK.asItem()); - tag(TIN_ORES_BLOCK_ITEM_TAG).add(TIN_ORE_BLOCK.asItem()).add(DEEPSLATE_TIN_ORE_BLOCK.asItem()); - tag(SILVER_ORES_BLOCK_ITEM_TAG).add(SILVER_ORE_BLOCK.asItem()).add(DEEPSLATE_SILVER_ORE_BLOCK.asItem()); - tag(ELECTROTINE_ORES_BLOCK_ITEM_TAG).add(ELECTROTINE_ORE_BLOCK.asItem()).add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.asItem()); - - tag(MARBLE_BLOCK_ITEM_TAG).add(MARBLE_BLOCK.asItem()); - tag(BASALT_BLOCK_ITEM_TAG).add(BASALT_BLOCK.asItem()); - tag(RUBY_STORAGE_BLOCK_ITEM_TAG).add(RUBY_BLOCK.asItem()); - tag(SAPPHIRE_STORAGE_BLOCK_ITEM_TAG).add(SAPPHIRE_BLOCK.asItem()); - tag(PERIDOT_STORAGE_BLOCK_ITEM_TAG).add(PERIDOT_BLOCK.asItem()); - tag(ELECTROTINE_STORAGE_BLOCK_ITEM_TAG).add(ELECTROTINE_BLOCK.asItem()); - tag(TIN_STORAGE_BLOCK_ITEM_TAG).add(TIN_BLOCK.asItem()); - tag(RAW_TIN_STORAGE_BLOCK_ITEM_TAG).add(RAW_TIN_BLOCK.asItem()); - tag(SILVER_STORAGE_BLOCK_ITEM_TAG).add(SILVER_BLOCK.asItem()); - tag(RAW_SILVER_STORAGE_BLOCK_ITEM_TAG).add(RAW_SILVER_BLOCK.asItem()); - - tag(WHITE_BACKPACK_TAG).add(WHITE_BACKPACK); - tag(ORANGE_BACKPACK_TAG).add(ORANGE_BACKPACK); - tag(MAGENTA_BACKPACK_TAG).add(MAGENTA_BACKPACK); - tag(LIGHT_BLUE_BACKPACK_TAG).add(LIGHT_BLUE_BACKPACK); - tag(YELLOW_BACKPACK_TAG).add(YELLOW_BACKPACK); - tag(LIME_BACKPACK_TAG).add(LIME_BACKPACK); - tag(PINK_BACKPACK_TAG).add(PINK_BACKPACK); - tag(GRAY_BACKPACK_TAG).add(GRAY_BACKPACK); - tag(LIGHT_GRAY_BACKPACK_TAG).add(LIGHT_GRAY_BACKPACK); - tag(CYAN_BACKPACK_TAG).add(CYAN_BACKPACK); - tag(PURPLE_BACKPACK_TAG).add(PURPLE_BACKPACK); - tag(BLUE_BACKPACK_TAG).add(BLUE_BACKPACK); - tag(BROWN_BACKPACK_TAG).add(BROWN_BACKPACK); - tag(GREEN_BACKPACK_TAG).add(GREEN_BACKPACK); - tag(RED_BACKPACK_TAG).add(RED_BACKPACK); - tag(BLACK_BACKPACK_TAG).add(BLACK_BACKPACK); + tag(TIN_INGOT_TAG).add(TIN_INGOT_ITEM.get()); + tag(SILVER_INGOT_TAG).add(SILVER_INGOT_ITEM.get()); + + tag(RUBY_ORES_BLOCK_ITEM_TAG).add(RUBY_ORE_BLOCK.get().asItem()).add(DEEPSLATE_RUBY_ORE_BLOCK.get().asItem()); + tag(SAPPHIRE_ORES_BLOCK_ITEM_TAG).add(SAPPHIRE_ORE_BLOCK.get().asItem()).add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get().asItem()); + tag(PERIDOT_ORES_BLOCK_ITEM_TAG).add(PERIDOT_ORE_BLOCK.get().asItem()).add(DEEPSLATE_PERIDOT_ORE_BLOCK.get().asItem()); + tag(TIN_ORES_BLOCK_ITEM_TAG).add(TIN_ORE_BLOCK.get().asItem()).add(DEEPSLATE_TIN_ORE_BLOCK.get().asItem()); + tag(SILVER_ORES_BLOCK_ITEM_TAG).add(SILVER_ORE_BLOCK.get().asItem()).add(DEEPSLATE_SILVER_ORE_BLOCK.get().asItem()); + tag(ELECTROTINE_ORES_BLOCK_ITEM_TAG).add(ELECTROTINE_ORE_BLOCK.get().asItem()).add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get().asItem()); + + tag(MARBLE_BLOCK_ITEM_TAG).add(MARBLE_BLOCK.get().asItem()); + tag(BASALT_BLOCK_ITEM_TAG).add(BASALT_BLOCK.get().asItem()); + tag(RUBY_STORAGE_BLOCK_ITEM_TAG).add(RUBY_BLOCK.get().asItem()); + tag(SAPPHIRE_STORAGE_BLOCK_ITEM_TAG).add(SAPPHIRE_BLOCK.get().asItem()); + tag(PERIDOT_STORAGE_BLOCK_ITEM_TAG).add(PERIDOT_BLOCK.get().asItem()); + tag(ELECTROTINE_STORAGE_BLOCK_ITEM_TAG).add(ELECTROTINE_BLOCK.get().asItem()); + tag(TIN_STORAGE_BLOCK_ITEM_TAG).add(TIN_BLOCK.get().asItem()); + tag(RAW_TIN_STORAGE_BLOCK_ITEM_TAG).add(RAW_TIN_BLOCK.get().asItem()); + tag(SILVER_STORAGE_BLOCK_ITEM_TAG).add(SILVER_BLOCK.get().asItem()); + tag(RAW_SILVER_STORAGE_BLOCK_ITEM_TAG).add(RAW_SILVER_BLOCK.get().asItem()); + + tag(WHITE_BACKPACK_TAG).add(WHITE_BACKPACK.get()); + tag(ORANGE_BACKPACK_TAG).add(ORANGE_BACKPACK.get()); + tag(MAGENTA_BACKPACK_TAG).add(MAGENTA_BACKPACK.get()); + tag(LIGHT_BLUE_BACKPACK_TAG).add(LIGHT_BLUE_BACKPACK.get()); + tag(YELLOW_BACKPACK_TAG).add(YELLOW_BACKPACK.get()); + tag(LIME_BACKPACK_TAG).add(LIME_BACKPACK.get()); + tag(PINK_BACKPACK_TAG).add(PINK_BACKPACK.get()); + tag(GRAY_BACKPACK_TAG).add(GRAY_BACKPACK.get()); + tag(LIGHT_GRAY_BACKPACK_TAG).add(LIGHT_GRAY_BACKPACK.get()); + tag(CYAN_BACKPACK_TAG).add(CYAN_BACKPACK.get()); + tag(PURPLE_BACKPACK_TAG).add(PURPLE_BACKPACK.get()); + tag(BLUE_BACKPACK_TAG).add(BLUE_BACKPACK.get()); + tag(BROWN_BACKPACK_TAG).add(BROWN_BACKPACK.get()); + tag(GREEN_BACKPACK_TAG).add(GREEN_BACKPACK.get()); + tag(RED_BACKPACK_TAG).add(RED_BACKPACK.get()); + tag(BLACK_BACKPACK_TAG).add(BLACK_BACKPACK.get()); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java index c08a0f4fe..e72a3b84d 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java @@ -4,7 +4,8 @@ import net.minecraftforge.common.data.LanguageProvider; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; +import static mrtjp.projectred.exploration.init.ExplorationItems.*; public class ExplorationLanguageProvider extends LanguageProvider { @@ -24,130 +25,130 @@ protected void addTranslations() { add("itemGroup." + MOD_ID, "Project Red: Exploration"); // Ores - add(RUBY_ORE_BLOCK, "Ruby Ore"); - add(DEEPSLATE_RUBY_ORE_BLOCK, "Deepslate Ruby Ore"); - add(SAPPHIRE_ORE_BLOCK, "Sapphire Ore"); - add(DEEPSLATE_SAPPHIRE_ORE_BLOCK, "Deepslate Sapphire Ore"); - add(PERIDOT_ORE_BLOCK, "Peridot Ore"); - add(DEEPSLATE_PERIDOT_ORE_BLOCK, "Deepslate Peridot Ore"); - add(TIN_ORE_BLOCK, "Tin Ore"); - add(DEEPSLATE_TIN_ORE_BLOCK, "Deepslate Tin Ore"); - add(SILVER_ORE_BLOCK, "Silver Ore"); - add(DEEPSLATE_SILVER_ORE_BLOCK, "Deepslate Silver Ore"); - add(ELECTROTINE_ORE_BLOCK, "Electrotine Ore"); - add(DEEPSLATE_ELECTROTINE_ORE_BLOCK, "Deepslate Electrotine Ore"); + add(RUBY_ORE_BLOCK.get(), "Ruby Ore"); + add(DEEPSLATE_RUBY_ORE_BLOCK.get(), "Deepslate Ruby Ore"); + add(SAPPHIRE_ORE_BLOCK.get(), "Sapphire Ore"); + add(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), "Deepslate Sapphire Ore"); + add(PERIDOT_ORE_BLOCK.get(), "Peridot Ore"); + add(DEEPSLATE_PERIDOT_ORE_BLOCK.get(), "Deepslate Peridot Ore"); + add(TIN_ORE_BLOCK.get(), "Tin Ore"); + add(DEEPSLATE_TIN_ORE_BLOCK.get(), "Deepslate Tin Ore"); + add(SILVER_ORE_BLOCK.get(), "Silver Ore"); + add(DEEPSLATE_SILVER_ORE_BLOCK.get(), "Deepslate Silver Ore"); + add(ELECTROTINE_ORE_BLOCK.get(), "Electrotine Ore"); + add(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), "Deepslate Electrotine Ore"); // Decorative blocks - add(MARBLE_BLOCK, "Marble"); - add(MARBLE_BRICK_BLOCK, "Marble Brick"); - add(BASALT_BLOCK, "Basalt"); - add(BASALT_COBBLE_BLOCK, "Basalt Cobblestone"); - add(BASALT_BRICK_BLOCK, "Basalt Brick"); - add(RUBY_BLOCK, "Ruby Block"); - add(SAPPHIRE_BLOCK, "Sapphire Block"); - add(PERIDOT_BLOCK, "Peridot Block"); - add(ELECTROTINE_BLOCK, "Electrotine Block"); - add(RAW_TIN_BLOCK, "Raw Tin Block"); - add(RAW_SILVER_BLOCK, "Raw Silver Block"); - add(TIN_BLOCK, "Tin Block"); - add(SILVER_BLOCK, "Silver Block"); + add(MARBLE_BLOCK.get(), "Marble"); + add(MARBLE_BRICK_BLOCK.get(), "Marble Brick"); + add(BASALT_BLOCK.get(), "Basalt"); + add(BASALT_COBBLE_BLOCK.get(), "Basalt Cobblestone"); + add(BASALT_BRICK_BLOCK.get(), "Basalt Brick"); + add(RUBY_BLOCK.get(), "Ruby Block"); + add(SAPPHIRE_BLOCK.get(), "Sapphire Block"); + add(PERIDOT_BLOCK.get(), "Peridot Block"); + add(ELECTROTINE_BLOCK.get(), "Electrotine Block"); + add(RAW_TIN_BLOCK.get(), "Raw Tin Block"); + add(RAW_SILVER_BLOCK.get(), "Raw Silver Block"); + add(TIN_BLOCK.get(), "Tin Block"); + add(SILVER_BLOCK.get(), "Silver Block"); // Walls - add(MARBLE_WALL, "Marble Wall"); - add(MARBLE_BRICK_WALL, "Marble Brick Wall"); - add(BASALT_WALL, "Basalt Wall"); - add(BASALT_COBBLE_WALL, "Basalt Cobblestone Wall"); - add(BASALT_BRICK_WALL, "Basalt Brick Wall"); - add(RUBY_BLOCK_WALL, "Ruby Wall"); - add(SAPPHIRE_BLOCK_WALL, "Sapphire Wall"); - add(PERIDOT_BLOCK_WALL, "Peridot Wall"); - add(ELECTROTINE_BLOCK_WALL, "Electrotine Wall"); + add(MARBLE_WALL.get(), "Marble Wall"); + add(MARBLE_BRICK_WALL.get(), "Marble Brick Wall"); + add(BASALT_WALL.get(), "Basalt Wall"); + add(BASALT_COBBLE_WALL.get(), "Basalt Cobblestone Wall"); + add(BASALT_BRICK_WALL.get(), "Basalt Brick Wall"); + add(RUBY_BLOCK_WALL.get(), "Ruby Wall"); + add(SAPPHIRE_BLOCK_WALL.get(), "Sapphire Wall"); + add(PERIDOT_BLOCK_WALL.get(), "Peridot Wall"); + add(ELECTROTINE_BLOCK_WALL.get(), "Electrotine Wall"); // Items - add(RAW_TIN_ITEM, "Raw Tin"); - add(TIN_INGOT_ITEM, "Tin Ingot"); - add(RAW_SILVER_ITEM, "Raw Silver"); - add(SILVER_INGOT_ITEM, "Silver Ingot"); - add(WOOL_GIN, "Wool Gin"); - add(ATHAME, "Athame"); + add(RAW_TIN_ITEM.get(), "Raw Tin"); + add(TIN_INGOT_ITEM.get(), "Tin Ingot"); + add(RAW_SILVER_ITEM.get(), "Raw Silver"); + add(SILVER_INGOT_ITEM.get(), "Silver Ingot"); + add(WOOL_GIN.get(), "Wool Gin"); + add(ATHAME.get(), "Athame"); // Axes - add(RUBY_AXE, "Ruby Axe"); - add(SAPPHIRE_AXE, "Sapphire Axe"); - add(PERIDOT_AXE, "Peridot Axe"); + add(RUBY_AXE.get(), "Ruby Axe"); + add(SAPPHIRE_AXE.get(), "Sapphire Axe"); + add(PERIDOT_AXE.get(), "Peridot Axe"); // Pickaxes - add(RUBY_PICKAXE, "Ruby Pickaxe"); - add(SAPPHIRE_PICKAXE, "Sapphire Pickaxe"); - add(PERIDOT_PICKAXE, "Peridot Pickaxe"); + add(RUBY_PICKAXE.get(), "Ruby Pickaxe"); + add(SAPPHIRE_PICKAXE.get(), "Sapphire Pickaxe"); + add(PERIDOT_PICKAXE.get(), "Peridot Pickaxe"); // Shovels - add(RUBY_SHOVEL, "Ruby Shovel"); - add(SAPPHIRE_SHOVEL, "Sapphire Shovel"); - add(PERIDOT_SHOVEL, "Peridot Shovel"); + add(RUBY_SHOVEL.get(), "Ruby Shovel"); + add(SAPPHIRE_SHOVEL.get(), "Sapphire Shovel"); + add(PERIDOT_SHOVEL.get(), "Peridot Shovel"); // Hoes - add(RUBY_HOE, "Ruby Hoe"); - add(SAPPHIRE_HOE, "Sapphire Hoe"); - add(PERIDOT_HOE, "Peridot Hoe"); + add(RUBY_HOE.get(), "Ruby Hoe"); + add(SAPPHIRE_HOE.get(), "Sapphire Hoe"); + add(PERIDOT_HOE.get(), "Peridot Hoe"); // Swords - add(RUBY_SWORD, "Ruby Sword"); - add(SAPPHIRE_SWORD, "Sapphire Sword"); - add(PERIDOT_SWORD, "Peridot Sword"); + add(RUBY_SWORD.get(), "Ruby Sword"); + add(SAPPHIRE_SWORD.get(), "Sapphire Sword"); + add(PERIDOT_SWORD.get(), "Peridot Sword"); // Helmets - add(RUBY_HELMET, "Ruby Helmet"); - add(SAPPHIRE_HELMET, "Sapphire Helmet"); - add(PERIDOT_HELMET, "Peridot Helmet"); + add(RUBY_HELMET.get(), "Ruby Helmet"); + add(SAPPHIRE_HELMET.get(), "Sapphire Helmet"); + add(PERIDOT_HELMET.get(), "Peridot Helmet"); // Chestplates - add(RUBY_CHESTPLATE, "Ruby Chestplate"); - add(SAPPHIRE_CHESTPLATE, "Sapphire Chestplate"); - add(PERIDOT_CHESTPLATE, "Peridot Chestplate"); + add(RUBY_CHESTPLATE.get(), "Ruby Chestplate"); + add(SAPPHIRE_CHESTPLATE.get(), "Sapphire Chestplate"); + add(PERIDOT_CHESTPLATE.get(), "Peridot Chestplate"); // Leggings - add(RUBY_LEGGINGS, "Ruby Leggings"); - add(SAPPHIRE_LEGGINGS, "Sapphire Leggings"); - add(PERIDOT_LEGGINGS, "Peridot Leggings"); + add(RUBY_LEGGINGS.get(), "Ruby Leggings"); + add(SAPPHIRE_LEGGINGS.get(), "Sapphire Leggings"); + add(PERIDOT_LEGGINGS.get(), "Peridot Leggings"); // Boots - add(RUBY_BOOTS, "Ruby Boots"); - add(SAPPHIRE_BOOTS, "Sapphire Boots"); - add(PERIDOT_BOOTS, "Peridot Boots"); + add(RUBY_BOOTS.get(), "Ruby Boots"); + add(SAPPHIRE_BOOTS.get(), "Sapphire Boots"); + add(PERIDOT_BOOTS.get(), "Peridot Boots"); // Saws - add(GOLD_SAW, "Gold Saw"); - add(RUBY_SAW, "Ruby Saw"); - add(SAPPHIRE_SAW, "Sapphire Saw"); - add(PERIDOT_SAW, "Peridot Saw"); + add(GOLD_SAW.get(), "Gold Saw"); + add(RUBY_SAW.get(), "Ruby Saw"); + add(SAPPHIRE_SAW.get(), "Sapphire Saw"); + add(PERIDOT_SAW.get(), "Peridot Saw"); // Sickles - add(WOOD_SICKLE, "Wood Sickle"); - add(STONE_SICKLE, "Stone Sickle"); - add(IRON_SICKLE, "Iron Sickle"); - add(GOLD_SICKLE, "Gold Sickle"); - add(DIAMOND_SICKLE, "Diamond Sickle"); - add(RUBY_SICKLE, "Ruby Sickle"); - add(SAPPHIRE_SICKLE, "Sapphire Sickle"); - add(PERIDOT_SICKLE, "Peridot Sickle"); + add(WOOD_SICKLE.get(), "Wood Sickle"); + add(STONE_SICKLE.get(), "Stone Sickle"); + add(IRON_SICKLE.get(), "Iron Sickle"); + add(GOLD_SICKLE.get(), "Gold Sickle"); + add(DIAMOND_SICKLE.get(), "Diamond Sickle"); + add(RUBY_SICKLE.get(), "Ruby Sickle"); + add(SAPPHIRE_SICKLE.get(), "Sapphire Sickle"); + add(PERIDOT_SICKLE.get(), "Peridot Sickle"); // Backpacks - add(WHITE_BACKPACK, "White Backpack"); - add(ORANGE_BACKPACK, "Orange Backpack"); - add(MAGENTA_BACKPACK, "Magenta Backpack"); - add(LIGHT_BLUE_BACKPACK, "Light Blue Backpack"); - add(YELLOW_BACKPACK, "Yellow Backpack"); - add(LIME_BACKPACK, "Lime Backpack"); - add(PINK_BACKPACK, "Pink Backpack"); - add(GRAY_BACKPACK, "Gray Backpack"); - add(LIGHT_GRAY_BACKPACK, "Light Gray Backpack"); - add(CYAN_BACKPACK, "Cyan Backpack"); - add(PURPLE_BACKPACK, "Purple Backpack"); - add(BLUE_BACKPACK, "Blue Backpack"); - add(BROWN_BACKPACK, "Brown Backpack"); - add(GREEN_BACKPACK, "Green Backpack"); - add(RED_BACKPACK, "Red Backpack"); - add(BLACK_BACKPACK, "Black Backpack"); + add(WHITE_BACKPACK.get(), "White Backpack"); + add(ORANGE_BACKPACK.get(), "Orange Backpack"); + add(MAGENTA_BACKPACK.get(), "Magenta Backpack"); + add(LIGHT_BLUE_BACKPACK.get(), "Light Blue Backpack"); + add(YELLOW_BACKPACK.get(), "Yellow Backpack"); + add(LIME_BACKPACK.get(), "Lime Backpack"); + add(PINK_BACKPACK.get(), "Pink Backpack"); + add(GRAY_BACKPACK.get(), "Gray Backpack"); + add(LIGHT_GRAY_BACKPACK.get(), "Light Gray Backpack"); + add(CYAN_BACKPACK.get(), "Cyan Backpack"); + add(PURPLE_BACKPACK.get(), "Purple Backpack"); + add(BLUE_BACKPACK.get(), "Blue Backpack"); + add(BROWN_BACKPACK.get(), "Brown Backpack"); + add(GREEN_BACKPACK.get(), "Green Backpack"); + add(RED_BACKPACK.get(), "Red Backpack"); + add(BLACK_BACKPACK.get(), "Black Backpack"); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java index dc434ee20..6fb06e8e0 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java @@ -3,8 +3,10 @@ import codechicken.lib.datagen.LootTableProvider; import net.minecraft.data.DataGenerator; -import static mrtjp.projectred.core.init.CoreReferences.*; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; +import static mrtjp.projectred.exploration.init.ExplorationItems.RAW_SILVER_ITEM; +import static mrtjp.projectred.exploration.init.ExplorationItems.RAW_TIN_ITEM; public class ExplorationLootTableProvider extends LootTableProvider.BlockLootProvider { @@ -21,43 +23,43 @@ public String getName() { protected void registerTables() { // Ores - register(RUBY_ORE_BLOCK, valueRangeOrSilkWithFortune(RUBY_ORE_BLOCK, RUBY_ITEM, 1, 2)); - register(DEEPSLATE_RUBY_ORE_BLOCK, valueRangeOrSilkWithFortune(DEEPSLATE_RUBY_ORE_BLOCK, RUBY_ITEM, 1, 2)); - register(SAPPHIRE_ORE_BLOCK, valueRangeOrSilkWithFortune(SAPPHIRE_ORE_BLOCK, SAPPHIRE_ITEM, 1, 2)); - register(DEEPSLATE_SAPPHIRE_ORE_BLOCK, valueRangeOrSilkWithFortune(DEEPSLATE_SAPPHIRE_ORE_BLOCK, SAPPHIRE_ITEM, 1, 2)); - register(PERIDOT_ORE_BLOCK, valueRangeOrSilkWithFortune(PERIDOT_ORE_BLOCK, PERIDOT_ITEM, 1, 2)); - register(DEEPSLATE_PERIDOT_ORE_BLOCK, valueRangeOrSilkWithFortune(DEEPSLATE_PERIDOT_ORE_BLOCK, PERIDOT_ITEM, 1, 2)); - register(ELECTROTINE_ORE_BLOCK, valueRangeOrSilkWithFortune(ELECTROTINE_ORE_BLOCK, ELECTROTINE_DUST_ITEM, 1, 8)); - register(DEEPSLATE_ELECTROTINE_ORE_BLOCK, valueRangeOrSilkWithFortune(DEEPSLATE_ELECTROTINE_ORE_BLOCK, ELECTROTINE_DUST_ITEM, 1, 8)); - register(TIN_ORE_BLOCK, singleItem(RAW_TIN_ITEM)); - register(DEEPSLATE_TIN_ORE_BLOCK, singleItem(RAW_TIN_ITEM)); - register(SILVER_ORE_BLOCK, singleItem(RAW_SILVER_ITEM)); - register(DEEPSLATE_SILVER_ORE_BLOCK, singleItem(RAW_SILVER_ITEM)); + register(RUBY_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(RUBY_ORE_BLOCK.get(), RUBY_ITEM.get(), 1, 2)); + register(DEEPSLATE_RUBY_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_RUBY_ORE_BLOCK.get(), RUBY_ITEM.get(), 1, 2)); + register(SAPPHIRE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(SAPPHIRE_ORE_BLOCK.get(), SAPPHIRE_ITEM.get(), 1, 2)); + register(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), SAPPHIRE_ITEM.get(), 1, 2)); + register(PERIDOT_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(PERIDOT_ORE_BLOCK.get(), PERIDOT_ITEM.get(), 1, 2)); + register(DEEPSLATE_PERIDOT_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_PERIDOT_ORE_BLOCK.get(), PERIDOT_ITEM.get(), 1, 2)); + register(ELECTROTINE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(ELECTROTINE_ORE_BLOCK.get(), ELECTROTINE_DUST_ITEM.get(), 1, 8)); + register(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), ELECTROTINE_DUST_ITEM.get(), 1, 8)); + register(TIN_ORE_BLOCK.get(), singleItem(RAW_TIN_ITEM.get())); + register(DEEPSLATE_TIN_ORE_BLOCK.get(), singleItem(RAW_TIN_ITEM.get())); + register(SILVER_ORE_BLOCK.get(), singleItem(RAW_SILVER_ITEM.get())); + register(DEEPSLATE_SILVER_ORE_BLOCK.get(), singleItem(RAW_SILVER_ITEM.get())); // Decorative Blocks - register(MARBLE_BLOCK, singleItem(MARBLE_BLOCK)); - register(MARBLE_BRICK_BLOCK, singleItem(MARBLE_BRICK_BLOCK)); - register(BASALT_BLOCK, singleItem(BASALT_BLOCK)); - register(BASALT_COBBLE_BLOCK, singleItem(BASALT_COBBLE_BLOCK)); - register(BASALT_BRICK_BLOCK, singleItem(BASALT_BRICK_BLOCK)); - register(RUBY_BLOCK, singleItem(RUBY_BLOCK)); - register(SAPPHIRE_BLOCK, singleItem(SAPPHIRE_BLOCK)); - register(PERIDOT_BLOCK, singleItem(PERIDOT_BLOCK)); - register(ELECTROTINE_BLOCK, singleItem(ELECTROTINE_BLOCK)); - register(RAW_TIN_BLOCK, singleItem(RAW_TIN_BLOCK)); - register(RAW_SILVER_BLOCK, singleItem(RAW_SILVER_BLOCK)); - register(TIN_BLOCK, singleItem(TIN_BLOCK)); - register(SILVER_BLOCK, singleItem(SILVER_BLOCK)); + register(MARBLE_BLOCK.get(), singleItem(MARBLE_BLOCK.get())); + register(MARBLE_BRICK_BLOCK.get(), singleItem(MARBLE_BRICK_BLOCK.get())); + register(BASALT_BLOCK.get(), singleItem(BASALT_BLOCK.get())); + register(BASALT_COBBLE_BLOCK.get(), singleItem(BASALT_COBBLE_BLOCK.get())); + register(BASALT_BRICK_BLOCK.get(), singleItem(BASALT_BRICK_BLOCK.get())); + register(RUBY_BLOCK.get(), singleItem(RUBY_BLOCK.get())); + register(SAPPHIRE_BLOCK.get(), singleItem(SAPPHIRE_BLOCK.get())); + register(PERIDOT_BLOCK.get(), singleItem(PERIDOT_BLOCK.get())); + register(ELECTROTINE_BLOCK.get(), singleItem(ELECTROTINE_BLOCK.get())); + register(RAW_TIN_BLOCK.get(), singleItem(RAW_TIN_BLOCK.get())); + register(RAW_SILVER_BLOCK.get(), singleItem(RAW_SILVER_BLOCK.get())); + register(TIN_BLOCK.get(), singleItem(TIN_BLOCK.get())); + register(SILVER_BLOCK.get(), singleItem(SILVER_BLOCK.get())); // Walls - register(MARBLE_WALL, singleItem(MARBLE_WALL)); - register(MARBLE_BRICK_WALL, singleItem(MARBLE_BRICK_WALL)); - register(BASALT_WALL, singleItem(BASALT_WALL)); - register(BASALT_COBBLE_WALL, singleItem(BASALT_COBBLE_WALL)); - register(BASALT_BRICK_WALL, singleItem(BASALT_BRICK_WALL)); - register(RUBY_BLOCK_WALL, singleItem(RUBY_BLOCK_WALL)); - register(SAPPHIRE_BLOCK_WALL, singleItem(SAPPHIRE_BLOCK_WALL)); - register(PERIDOT_BLOCK_WALL, singleItem(PERIDOT_BLOCK_WALL)); - register(ELECTROTINE_BLOCK_WALL, singleItem(ELECTROTINE_BLOCK_WALL)); + register(MARBLE_WALL.get(), singleItem(MARBLE_WALL.get())); + register(MARBLE_BRICK_WALL.get(), singleItem(MARBLE_BRICK_WALL.get())); + register(BASALT_WALL.get(), singleItem(BASALT_WALL.get())); + register(BASALT_COBBLE_WALL.get(), singleItem(BASALT_COBBLE_WALL.get())); + register(BASALT_BRICK_WALL.get(), singleItem(BASALT_BRICK_WALL.get())); + register(RUBY_BLOCK_WALL.get(), singleItem(RUBY_BLOCK_WALL.get())); + register(SAPPHIRE_BLOCK_WALL.get(), singleItem(SAPPHIRE_BLOCK_WALL.get())); + register(PERIDOT_BLOCK_WALL.get(), singleItem(PERIDOT_BLOCK_WALL.get())); + register(ELECTROTINE_BLOCK_WALL.get(), singleItem(ELECTROTINE_BLOCK_WALL.get())); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java index 8c47166ec..7f66f91ee 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java @@ -17,10 +17,12 @@ import java.util.Collection; import java.util.List; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; import static mrtjp.projectred.core.init.CoreTags.*; import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; +import static mrtjp.projectred.exploration.init.ExplorationItems.*; +import static mrtjp.projectred.exploration.init.ExplorationRecipeSerializers.BACKPACK_DYE_RECIPE_SERIALIZER; import static mrtjp.projectred.exploration.init.ExplorationTags.*; @SuppressWarnings("DataFlowIssue") @@ -39,128 +41,128 @@ public String getName() { protected void registerRecipes() { // Ores - oreSmeltingRecipe(RUBY_ITEM, List.of(RUBY_ORE_BLOCK, DEEPSLATE_RUBY_ORE_BLOCK), 1F); - oreSmeltingRecipe(SAPPHIRE_ITEM, List.of(SAPPHIRE_ORE_BLOCK, DEEPSLATE_SAPPHIRE_ORE_BLOCK), 1F); - oreSmeltingRecipe(PERIDOT_ITEM, List.of(PERIDOT_ORE_BLOCK, DEEPSLATE_PERIDOT_ORE_BLOCK), 1F); - oreSmeltingRecipe(ELECTROTINE_DUST_ITEM, List.of(ELECTROTINE_ORE_BLOCK, DEEPSLATE_ELECTROTINE_ORE_BLOCK), 0.7F); - oreSmeltingRecipe(TIN_INGOT_ITEM, List.of(TIN_ORE_BLOCK, DEEPSLATE_TIN_ORE_BLOCK, RAW_TIN_ITEM), 0.7F); - oreSmeltingRecipe(SILVER_INGOT_ITEM, List.of(SILVER_ORE_BLOCK, DEEPSLATE_SILVER_ORE_BLOCK, RAW_TIN_ITEM), 0.7F); + oreSmeltingRecipe(RUBY_ITEM.get(), List.of(RUBY_ORE_BLOCK.get(), DEEPSLATE_RUBY_ORE_BLOCK.get()), 1F); + oreSmeltingRecipe(SAPPHIRE_ITEM.get(), List.of(SAPPHIRE_ORE_BLOCK.get(), DEEPSLATE_SAPPHIRE_ORE_BLOCK.get()), 1F); + oreSmeltingRecipe(PERIDOT_ITEM.get(), List.of(PERIDOT_ORE_BLOCK.get(), DEEPSLATE_PERIDOT_ORE_BLOCK.get()), 1F); + oreSmeltingRecipe(ELECTROTINE_DUST_ITEM.get(), List.of(ELECTROTINE_ORE_BLOCK.get(), DEEPSLATE_ELECTROTINE_ORE_BLOCK.get()), 0.7F); + oreSmeltingRecipe(TIN_INGOT_ITEM.get(), List.of(TIN_ORE_BLOCK.get(), DEEPSLATE_TIN_ORE_BLOCK.get(), RAW_TIN_ITEM.get()), 0.7F); + oreSmeltingRecipe(SILVER_INGOT_ITEM.get(), List.of(SILVER_ORE_BLOCK.get(), DEEPSLATE_SILVER_ORE_BLOCK.get(), RAW_TIN_ITEM.get()), 0.7F); // Decorative blocks - smelting(BASALT_BLOCK) - .ingredient(BASALT_COBBLE_BLOCK) + smelting(BASALT_BLOCK.get()) + .ingredient(BASALT_COBBLE_BLOCK.get()) .experience(0.1F); - shapedRecipe(MARBLE_BRICK_BLOCK, 4) - .key('B', MARBLE_BLOCK) + shapedRecipe(MARBLE_BRICK_BLOCK.get(), 4) + .key('B', MARBLE_BLOCK.get()) .patternLine("BB") .patternLine("BB"); - shapedRecipe(BASALT_BRICK_BLOCK, 4) - .key('B', BASALT_BLOCK) + shapedRecipe(BASALT_BRICK_BLOCK.get(), 4) + .key('B', BASALT_BLOCK.get()) .patternLine("BB") .patternLine("BB"); - nineBlockStorageRecipes(RUBY_GEM_TAG, RUBY_BLOCK, RUBY_ITEM); - nineBlockStorageRecipes(SAPPHIRE_GEM_TAG, SAPPHIRE_BLOCK, SAPPHIRE_ITEM); - nineBlockStorageRecipes(PERIDOT_GEM_TAG, PERIDOT_BLOCK, PERIDOT_ITEM); - nineBlockStorageRecipes(ELECTROTINE_DUST_TAG, ELECTROTINE_BLOCK, ELECTROTINE_DUST_ITEM); - nineBlockStorageRecipes(RAW_MATERIALS_TIN_TAG, RAW_TIN_BLOCK, RAW_TIN_ITEM); - nineBlockStorageRecipes(TIN_INGOT_TAG, TIN_BLOCK, TIN_INGOT_ITEM); - nineBlockStorageRecipes(RAW_MATERIALS_SILVER_TAG, RAW_SILVER_BLOCK, RAW_SILVER_ITEM); - nineBlockStorageRecipes(SILVER_INGOT_TAG, SILVER_BLOCK, SILVER_INGOT_ITEM); + nineBlockStorageRecipes(RUBY_GEM_TAG, RUBY_BLOCK.get(), RUBY_ITEM.get()); + nineBlockStorageRecipes(SAPPHIRE_GEM_TAG, SAPPHIRE_BLOCK.get(), SAPPHIRE_ITEM.get()); + nineBlockStorageRecipes(PERIDOT_GEM_TAG, PERIDOT_BLOCK.get(), PERIDOT_ITEM.get()); + nineBlockStorageRecipes(ELECTROTINE_DUST_TAG, ELECTROTINE_BLOCK.get(), ELECTROTINE_DUST_ITEM.get()); + nineBlockStorageRecipes(RAW_MATERIALS_TIN_TAG, RAW_TIN_BLOCK.get(), RAW_TIN_ITEM.get()); + nineBlockStorageRecipes(TIN_INGOT_TAG, TIN_BLOCK.get(), TIN_INGOT_ITEM.get()); + nineBlockStorageRecipes(RAW_MATERIALS_SILVER_TAG, RAW_SILVER_BLOCK.get(), RAW_SILVER_ITEM.get()); + nineBlockStorageRecipes(SILVER_INGOT_TAG, SILVER_BLOCK.get(), SILVER_INGOT_ITEM.get()); // Walls - wallRecipe(MARBLE_WALL, MARBLE_BLOCK_ITEM_TAG); - wallRecipe(MARBLE_BRICK_WALL, MARBLE_BRICK_BLOCK); - wallRecipe(BASALT_WALL, BASALT_BLOCK_ITEM_TAG); - wallRecipe(BASALT_COBBLE_WALL, BASALT_COBBLE_BLOCK); - wallRecipe(BASALT_BRICK_WALL, BASALT_BRICK_BLOCK); - wallRecipe(RUBY_BLOCK_WALL, RUBY_STORAGE_BLOCK_ITEM_TAG); - wallRecipe(SAPPHIRE_BLOCK_WALL, SAPPHIRE_STORAGE_BLOCK_ITEM_TAG); - wallRecipe(PERIDOT_BLOCK_WALL, PERIDOT_STORAGE_BLOCK_ITEM_TAG); - wallRecipe(ELECTROTINE_BLOCK_WALL, ELECTROTINE_STORAGE_BLOCK_ITEM_TAG); + wallRecipe(MARBLE_WALL.get(), MARBLE_BLOCK_ITEM_TAG); + wallRecipe(MARBLE_BRICK_WALL.get(), MARBLE_BRICK_BLOCK.get()); + wallRecipe(BASALT_WALL.get(), BASALT_BLOCK_ITEM_TAG); + wallRecipe(BASALT_COBBLE_WALL.get(), BASALT_COBBLE_BLOCK.get()); + wallRecipe(BASALT_BRICK_WALL.get(), BASALT_BRICK_BLOCK.get()); + wallRecipe(RUBY_BLOCK_WALL.get(), RUBY_STORAGE_BLOCK_ITEM_TAG); + wallRecipe(SAPPHIRE_BLOCK_WALL.get(), SAPPHIRE_STORAGE_BLOCK_ITEM_TAG); + wallRecipe(PERIDOT_BLOCK_WALL.get(), PERIDOT_STORAGE_BLOCK_ITEM_TAG); + wallRecipe(ELECTROTINE_BLOCK_WALL.get(), ELECTROTINE_STORAGE_BLOCK_ITEM_TAG); // Wool gin - shapedRecipe(WOOL_GIN) + shapedRecipe(WOOL_GIN.get()) .key('S', Tags.Items.RODS_WOODEN) - .key('I', IRON_COIL_ITEM) + .key('I', IRON_COIL_ITEM.get()) .patternLine("SIS") .patternLine("SSS") .patternLine(" S "); shapedRecipe(Items.STRING, 4, new ResourceLocation(MOD_ID, "string_from_wool_gin")) .key('W', ItemTags.WOOL) - .key('G', WOOL_GIN) + .key('G', WOOL_GIN.get()) .patternLine("GW"); // Tools - shapedRecipe(ATHAME) + shapedRecipe(ATHAME.get()) .key('W', Tags.Items.RODS_WOODEN) .key('S', SILVER_INGOT_TAG) .patternLine("S") .patternLine("W"); - axeRecipe(RUBY_AXE, RUBY_GEM_TAG); - axeRecipe(SAPPHIRE_AXE, SAPPHIRE_GEM_TAG); - axeRecipe(PERIDOT_AXE, PERIDOT_GEM_TAG); + axeRecipe(RUBY_AXE.get(), RUBY_GEM_TAG); + axeRecipe(SAPPHIRE_AXE.get(), SAPPHIRE_GEM_TAG); + axeRecipe(PERIDOT_AXE.get(), PERIDOT_GEM_TAG); - pickaxeRecipe(RUBY_PICKAXE, RUBY_GEM_TAG); - pickaxeRecipe(SAPPHIRE_PICKAXE, SAPPHIRE_GEM_TAG); - pickaxeRecipe(PERIDOT_PICKAXE, PERIDOT_GEM_TAG); + pickaxeRecipe(RUBY_PICKAXE.get(), RUBY_GEM_TAG); + pickaxeRecipe(SAPPHIRE_PICKAXE.get(), SAPPHIRE_GEM_TAG); + pickaxeRecipe(PERIDOT_PICKAXE.get(), PERIDOT_GEM_TAG); - shovelRecipe(RUBY_SHOVEL, RUBY_GEM_TAG); - shovelRecipe(SAPPHIRE_SHOVEL, SAPPHIRE_GEM_TAG); - shovelRecipe(PERIDOT_SHOVEL, PERIDOT_GEM_TAG); + shovelRecipe(RUBY_SHOVEL.get(), RUBY_GEM_TAG); + shovelRecipe(SAPPHIRE_SHOVEL.get(), SAPPHIRE_GEM_TAG); + shovelRecipe(PERIDOT_SHOVEL.get(), PERIDOT_GEM_TAG); - hoeRecipe(RUBY_HOE, RUBY_GEM_TAG); - hoeRecipe(SAPPHIRE_HOE, SAPPHIRE_GEM_TAG); - hoeRecipe(PERIDOT_HOE, PERIDOT_GEM_TAG); + hoeRecipe(RUBY_HOE.get(), RUBY_GEM_TAG); + hoeRecipe(SAPPHIRE_HOE.get(), SAPPHIRE_GEM_TAG); + hoeRecipe(PERIDOT_HOE.get(), PERIDOT_GEM_TAG); - swordRecipe(RUBY_SWORD, RUBY_GEM_TAG); - swordRecipe(SAPPHIRE_SWORD, SAPPHIRE_GEM_TAG); - swordRecipe(PERIDOT_SWORD, PERIDOT_GEM_TAG); + swordRecipe(RUBY_SWORD.get(), RUBY_GEM_TAG); + swordRecipe(SAPPHIRE_SWORD.get(), SAPPHIRE_GEM_TAG); + swordRecipe(PERIDOT_SWORD.get(), PERIDOT_GEM_TAG); - sawRecipe(GOLD_SAW, Tags.Items.INGOTS_GOLD); - sawRecipe(RUBY_SAW, RUBY_GEM_TAG); - sawRecipe(SAPPHIRE_SAW, SAPPHIRE_GEM_TAG); - sawRecipe(PERIDOT_SAW, PERIDOT_GEM_TAG); + sawRecipe(GOLD_SAW.get(), Tags.Items.INGOTS_GOLD); + sawRecipe(RUBY_SAW.get(), RUBY_GEM_TAG); + sawRecipe(SAPPHIRE_SAW.get(), SAPPHIRE_GEM_TAG); + sawRecipe(PERIDOT_SAW.get(), PERIDOT_GEM_TAG); - sickleRecipe(WOOD_SICKLE, Tags.Items.RODS_WOODEN); - sickleRecipe(STONE_SICKLE, Tags.Items.COBBLESTONE); - sickleRecipe(IRON_SICKLE, Tags.Items.INGOTS_IRON); - sickleRecipe(GOLD_SICKLE, Tags.Items.INGOTS_GOLD); - sickleRecipe(DIAMOND_SICKLE, Tags.Items.GEMS_DIAMOND); - sickleRecipe(RUBY_SICKLE, RUBY_GEM_TAG); - sickleRecipe(SAPPHIRE_SICKLE, SAPPHIRE_GEM_TAG); - sickleRecipe(PERIDOT_SICKLE, PERIDOT_GEM_TAG); + sickleRecipe(WOOD_SICKLE.get(), Tags.Items.RODS_WOODEN); + sickleRecipe(STONE_SICKLE.get(), Tags.Items.COBBLESTONE); + sickleRecipe(IRON_SICKLE.get(), Tags.Items.INGOTS_IRON); + sickleRecipe(GOLD_SICKLE.get(), Tags.Items.INGOTS_GOLD); + sickleRecipe(DIAMOND_SICKLE.get(), Tags.Items.GEMS_DIAMOND); + sickleRecipe(RUBY_SICKLE.get(), RUBY_GEM_TAG); + sickleRecipe(SAPPHIRE_SICKLE.get(), SAPPHIRE_GEM_TAG); + sickleRecipe(PERIDOT_SICKLE.get(), PERIDOT_GEM_TAG); // Armor - helmetRecipe(RUBY_HELMET, RUBY_GEM_TAG); - helmetRecipe(SAPPHIRE_HELMET, SAPPHIRE_GEM_TAG); - helmetRecipe(PERIDOT_HELMET, PERIDOT_GEM_TAG); + helmetRecipe(RUBY_HELMET.get(), RUBY_GEM_TAG); + helmetRecipe(SAPPHIRE_HELMET.get(), SAPPHIRE_GEM_TAG); + helmetRecipe(PERIDOT_HELMET.get(), PERIDOT_GEM_TAG); - chestplateRecipe(RUBY_CHESTPLATE, RUBY_GEM_TAG); - chestplateRecipe(SAPPHIRE_CHESTPLATE, SAPPHIRE_GEM_TAG); - chestplateRecipe(PERIDOT_CHESTPLATE, PERIDOT_GEM_TAG); + chestplateRecipe(RUBY_CHESTPLATE.get(), RUBY_GEM_TAG); + chestplateRecipe(SAPPHIRE_CHESTPLATE.get(), SAPPHIRE_GEM_TAG); + chestplateRecipe(PERIDOT_CHESTPLATE.get(), PERIDOT_GEM_TAG); - leggingsRecipe(RUBY_LEGGINGS, RUBY_GEM_TAG); - leggingsRecipe(SAPPHIRE_LEGGINGS, SAPPHIRE_GEM_TAG); - leggingsRecipe(PERIDOT_LEGGINGS, PERIDOT_GEM_TAG); + leggingsRecipe(RUBY_LEGGINGS.get(), RUBY_GEM_TAG); + leggingsRecipe(SAPPHIRE_LEGGINGS.get(), SAPPHIRE_GEM_TAG); + leggingsRecipe(PERIDOT_LEGGINGS.get(), PERIDOT_GEM_TAG); - bootsRecipe(RUBY_BOOTS, RUBY_GEM_TAG); - bootsRecipe(SAPPHIRE_BOOTS, SAPPHIRE_GEM_TAG); - bootsRecipe(PERIDOT_BOOTS, PERIDOT_GEM_TAG); + bootsRecipe(RUBY_BOOTS.get(), RUBY_GEM_TAG); + bootsRecipe(SAPPHIRE_BOOTS.get(), SAPPHIRE_GEM_TAG); + bootsRecipe(PERIDOT_BOOTS.get(), PERIDOT_GEM_TAG); // Backpacks for (int i = 0; i < 15; i++) { backpackRecipe(getBackpackByColor(i)); } - special(BACKPACK_DYE_RECIPE_SERIALIZER, new ResourceLocation(MOD_ID, "backpack_dye")); + special(BACKPACK_DYE_RECIPE_SERIALIZER.get(), new ResourceLocation(MOD_ID, "backpack_dye")); } private void oreSmeltingRecipe(ItemLike result, Collection sources, float xp) { @@ -300,7 +302,7 @@ private void backpackRecipe(Item backpack) { DyeColor color = ((BackpackItem) backpack).getDyeColor(); ShapedRecipeBuilder builder = shapedRecipe(backpack) - .key('C', WOVEN_CLOTH_ITEM); + .key('C', WOVEN_CLOTH_ITEM.get()); if (color != DyeColor.WHITE) { // White is default and doesn't need a dye builder.patternLine("CCC") diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationBlocks.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationBlocks.java index 1ffefb8c8..29f531c51 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationBlocks.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationBlocks.java @@ -18,7 +18,6 @@ import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.exploration.ProjectRedExploration.*; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; @SuppressWarnings("NotNullFieldNotInitialized") public class ExplorationBlocks { @@ -60,57 +59,95 @@ public class ExplorationBlocks { public static final String ID_PERIDOT_BLOCK_WALL = "peridot_block_wall"; public static final String ID_ELECTROTINE_BLOCK_WALL = "electrotine_block_wall"; - // Direct references needed for early init and worldgen + // Ores + public static RegistryObject RUBY_ORE_BLOCK; + public static RegistryObject DEEPSLATE_RUBY_ORE_BLOCK; + public static RegistryObject SAPPHIRE_ORE_BLOCK; + public static RegistryObject DEEPSLATE_SAPPHIRE_ORE_BLOCK; + public static RegistryObject PERIDOT_ORE_BLOCK; + public static RegistryObject DEEPSLATE_PERIDOT_ORE_BLOCK; + public static RegistryObject TIN_ORE_BLOCK; + public static RegistryObject DEEPSLATE_TIN_ORE_BLOCK; + public static RegistryObject SILVER_ORE_BLOCK; + public static RegistryObject DEEPSLATE_SILVER_ORE_BLOCK; + public static RegistryObject ELECTROTINE_ORE_BLOCK; + public static RegistryObject DEEPSLATE_ELECTROTINE_ORE_BLOCK; + + // Decorative blocks public static RegistryObject MARBLE_BLOCK; public static RegistryObject MARBLE_BRICK_BLOCK; public static RegistryObject BASALT_BLOCK; public static RegistryObject BASALT_COBBLE_BLOCK; public static RegistryObject BASALT_BRICK_BLOCK; + public static RegistryObject RUBY_BLOCK; + public static RegistryObject SAPPHIRE_BLOCK; + public static RegistryObject PERIDOT_BLOCK; + public static RegistryObject ELECTROTINE_BLOCK; + public static RegistryObject RAW_TIN_BLOCK; + public static RegistryObject RAW_SILVER_BLOCK; + public static RegistryObject TIN_BLOCK; + public static RegistryObject SILVER_BLOCK; + + // Walls + public static RegistryObject MARBLE_WALL; + public static RegistryObject MARBLE_BRICK_WALL; + public static RegistryObject BASALT_WALL; + public static RegistryObject BASALT_COBBLE_WALL; + public static RegistryObject BASALT_BRICK_WALL; + public static RegistryObject RUBY_BLOCK_WALL; + public static RegistryObject SAPPHIRE_BLOCK_WALL; + public static RegistryObject PERIDOT_BLOCK_WALL; + public static RegistryObject ELECTROTINE_BLOCK_WALL; - public static void register() { - /* Blocks */ +// // Direct references needed for early init and worldgen +// public static RegistryObject MARBLE_BLOCK; +// public static RegistryObject MARBLE_BRICK_BLOCK; +// public static RegistryObject BASALT_BLOCK; +// public static RegistryObject BASALT_COBBLE_BLOCK; +// public static RegistryObject BASALT_BRICK_BLOCK; + + public static void register() { // Ores - BLOCKS.register(ID_RUBY_ORE, () -> createOreBlock(false, 2, 7)); - BLOCKS.register(ID_DEEPSLATE_RUBY_ORE, () -> createOreBlock(true, 2, 7)); - BLOCKS.register(ID_SAPPHIRE_ORE, () -> createOreBlock(false, 2, 7)); - BLOCKS.register(ID_DEEPSLATE_SAPPHIRE_ORE, () -> createOreBlock(true, 2, 7)); - BLOCKS.register(ID_PERIDOT_ORE, () -> createOreBlock(false, 2, 7)); - BLOCKS.register(ID_DEEPSLATE_PERIDOT_ORE, () -> createOreBlock(true, 2, 7)); - BLOCKS.register(ID_TIN_ORE, () -> createOreBlock(false, 0, 0)); - BLOCKS.register(ID_DEEPSLATE_TIN_ORE, () -> createOreBlock(true, 0, 0)); - BLOCKS.register(ID_SILVER_ORE, () -> createOreBlock(false, 0, 0)); - BLOCKS.register(ID_DEEPSLATE_SILVER_ORE, () -> createOreBlock(true, 0, 0)); - BLOCKS.register(ID_ELECTROTINE_ORE, () -> createElectrotineOreBlock(false, 1, 5)); - BLOCKS.register(ID_DEEPSLATE_ELECTROTINE_ORE, () -> createElectrotineOreBlock(true, 1, 5)); + RUBY_ORE_BLOCK = BLOCKS.register(ID_RUBY_ORE, () -> createOreBlock(false, 2, 7)); + DEEPSLATE_RUBY_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_RUBY_ORE, () -> createOreBlock(true, 2, 7)); + SAPPHIRE_ORE_BLOCK = BLOCKS.register(ID_SAPPHIRE_ORE, () -> createOreBlock(false, 2, 7)); + DEEPSLATE_SAPPHIRE_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_SAPPHIRE_ORE, () -> createOreBlock(true, 2, 7)); + PERIDOT_ORE_BLOCK = BLOCKS.register(ID_PERIDOT_ORE, () -> createOreBlock(false, 2, 7)); + DEEPSLATE_PERIDOT_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_PERIDOT_ORE, () -> createOreBlock(true, 2, 7)); + TIN_ORE_BLOCK = BLOCKS.register(ID_TIN_ORE, () -> createOreBlock(false, 0, 0)); + DEEPSLATE_TIN_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_TIN_ORE, () -> createOreBlock(true, 0, 0)); + SILVER_ORE_BLOCK = BLOCKS.register(ID_SILVER_ORE, () -> createOreBlock(false, 0, 0)); + DEEPSLATE_SILVER_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_SILVER_ORE, () -> createOreBlock(true, 0, 0)); + ELECTROTINE_ORE_BLOCK = BLOCKS.register(ID_ELECTROTINE_ORE, () -> createElectrotineOreBlock(false, 1, 5)); + DEEPSLATE_ELECTROTINE_ORE_BLOCK = BLOCKS.register(ID_DEEPSLATE_ELECTROTINE_ORE, () -> createElectrotineOreBlock(true, 1, 5)); // Decorative blocks - MARBLE_BLOCK = BLOCKS.register(ID_MARBLE, () -> createDecorativeStoneBlock(1F, 14F)); - MARBLE_BRICK_BLOCK = BLOCKS.register(ID_MARBLE_BRICK, () -> createDecorativeStoneBlock(1F, 14F)); - BASALT_BLOCK = BLOCKS.register(ID_BASALT, () -> createDecorativeStoneBlock(2.5F, 16F)); - BASALT_COBBLE_BLOCK = BLOCKS.register(ID_BASALT_COBBLE, () -> createDecorativeStoneBlock(2.5F, 14F)); - BASALT_BRICK_BLOCK = BLOCKS.register(ID_BASALT_BRICK, () -> createDecorativeStoneBlock(2.5F, 20F)); - RegistryObject rubyBlock = BLOCKS.register(ID_RUBY_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); - RegistryObject sapphireBlock = BLOCKS.register(ID_SAPPHIRE_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); - RegistryObject peridotBlock = BLOCKS.register(ID_PERIDOT_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); - RegistryObject electrotineBlock = BLOCKS.register(ID_ELECTROTINE_BLOCK, () -> createDecorativeMetalBlock(5F, 10F)); - BLOCKS.register(ID_RAW_TIN_BLOCK, () -> createDecorativeMetalBlock(2F, 6F)); - BLOCKS.register(ID_TIN_BLOCK, () -> createDecorativeMetalBlock(2F, 6F)); - BLOCKS.register(ID_RAW_SILVER_BLOCK, () -> createDecorativeMetalBlock(3F, 6F)); - BLOCKS.register(ID_SILVER_BLOCK, () -> createDecorativeMetalBlock(3F, 6F)); + MARBLE_BLOCK = BLOCKS.register(ID_MARBLE, () -> createDecorativeStoneBlock(1F, 14F)); + MARBLE_BRICK_BLOCK = BLOCKS.register(ID_MARBLE_BRICK, () -> createDecorativeStoneBlock(1F, 14F)); + BASALT_BLOCK = BLOCKS.register(ID_BASALT, () -> createDecorativeStoneBlock(2.5F, 16F)); + BASALT_COBBLE_BLOCK = BLOCKS.register(ID_BASALT_COBBLE, () -> createDecorativeStoneBlock(2.5F, 14F)); + BASALT_BRICK_BLOCK = BLOCKS.register(ID_BASALT_BRICK, () -> createDecorativeStoneBlock(2.5F, 20F)); + RUBY_BLOCK = BLOCKS.register(ID_RUBY_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); + SAPPHIRE_BLOCK = BLOCKS.register(ID_SAPPHIRE_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); + PERIDOT_BLOCK = BLOCKS.register(ID_PERIDOT_BLOCK, () -> createDecorativeGemBlock(5F, 10F)); + ELECTROTINE_BLOCK = BLOCKS.register(ID_ELECTROTINE_BLOCK, () -> createDecorativeMetalBlock(5F, 10F)); + RAW_TIN_BLOCK = BLOCKS.register(ID_RAW_TIN_BLOCK, () -> createDecorativeMetalBlock(2F, 6F)); + RAW_SILVER_BLOCK = BLOCKS.register(ID_TIN_BLOCK, () -> createDecorativeMetalBlock(2F, 6F)); + TIN_BLOCK = BLOCKS.register(ID_RAW_SILVER_BLOCK, () -> createDecorativeMetalBlock(3F, 6F)); + SILVER_BLOCK = BLOCKS.register(ID_SILVER_BLOCK, () -> createDecorativeMetalBlock(3F, 6F)); // Walls - //Note: Direct refs used here bc ExplorationReferences isnt filled out when wall block suppliers are run - BLOCKS.register(ID_MARBLE_WALL, () -> createWallBlock(MARBLE_BLOCK)); - BLOCKS.register(ID_MARBLE_BRICK_WALL, () -> createWallBlock(MARBLE_BRICK_BLOCK)); - BLOCKS.register(ID_BASALT_WALL, () -> createWallBlock(BASALT_BLOCK)); - BLOCKS.register(ID_BASALT_COBBLE_WALL, () -> createWallBlock(BASALT_COBBLE_BLOCK)); - BLOCKS.register(ID_BASALT_BRICK_WALL, () -> createWallBlock(BASALT_BRICK_BLOCK)); - BLOCKS.register(ID_RUBY_BLOCK_WALL, () -> createWallBlock(rubyBlock)); - BLOCKS.register(ID_SAPPHIRE_BLOCK_WALL, () -> createWallBlock(sapphireBlock)); - BLOCKS.register(ID_PERIDOT_BLOCK_WALL, () -> createWallBlock(peridotBlock)); - BLOCKS.register(ID_ELECTROTINE_BLOCK_WALL, () -> createWallBlock(electrotineBlock)); + MARBLE_WALL = BLOCKS.register(ID_MARBLE_WALL, () -> createWallBlock(MARBLE_BLOCK)); + MARBLE_BRICK_WALL = BLOCKS.register(ID_MARBLE_BRICK_WALL, () -> createWallBlock(MARBLE_BRICK_BLOCK)); + BASALT_WALL = BLOCKS.register(ID_BASALT_WALL, () -> createWallBlock(BASALT_BLOCK)); + BASALT_COBBLE_WALL = BLOCKS.register(ID_BASALT_COBBLE_WALL, () -> createWallBlock(BASALT_COBBLE_BLOCK)); + BASALT_BRICK_WALL = BLOCKS.register(ID_BASALT_BRICK_WALL, () -> createWallBlock(BASALT_BRICK_BLOCK)); + RUBY_BLOCK_WALL = BLOCKS.register(ID_RUBY_BLOCK_WALL, () -> createWallBlock(RUBY_BLOCK)); + SAPPHIRE_BLOCK_WALL = BLOCKS.register(ID_SAPPHIRE_BLOCK_WALL, () -> createWallBlock(SAPPHIRE_BLOCK)); + PERIDOT_BLOCK_WALL = BLOCKS.register(ID_PERIDOT_BLOCK_WALL, () -> createWallBlock(PERIDOT_BLOCK)); + ELECTROTINE_BLOCK_WALL = BLOCKS.register(ID_ELECTROTINE_BLOCK_WALL, () -> createWallBlock(ELECTROTINE_BLOCK)); /* Block Items */ @@ -134,10 +171,10 @@ public static void register() { ITEMS.register(ID_BASALT, () -> createBlockItem(BASALT_BLOCK)); ITEMS.register(ID_BASALT_COBBLE, () -> createBlockItem(BASALT_COBBLE_BLOCK)); ITEMS.register(ID_BASALT_BRICK, () -> createBlockItem(BASALT_BRICK_BLOCK)); - ITEMS.register(ID_RUBY_BLOCK, () -> createBlockItem(rubyBlock)); - ITEMS.register(ID_SAPPHIRE_BLOCK, () -> createBlockItem(sapphireBlock)); - ITEMS.register(ID_PERIDOT_BLOCK, () -> createBlockItem(peridotBlock)); - ITEMS.register(ID_ELECTROTINE_BLOCK,() -> createBlockItem(electrotineBlock)); + ITEMS.register(ID_RUBY_BLOCK, () -> createBlockItem(RUBY_BLOCK)); + ITEMS.register(ID_SAPPHIRE_BLOCK, () -> createBlockItem(SAPPHIRE_BLOCK)); + ITEMS.register(ID_PERIDOT_BLOCK, () -> createBlockItem(PERIDOT_BLOCK)); + ITEMS.register(ID_ELECTROTINE_BLOCK,() -> createBlockItem(ELECTROTINE_BLOCK)); ITEMS.register(ID_RAW_TIN_BLOCK, () -> createBlockItem(RAW_TIN_BLOCK)); ITEMS.register(ID_TIN_BLOCK, () -> createBlockItem(TIN_BLOCK)); ITEMS.register(ID_RAW_SILVER_BLOCK, () -> createBlockItem(RAW_SILVER_BLOCK)); @@ -157,15 +194,15 @@ public static void register() { public static void onRegisterMicroMaterials(RegistryEvent.Register event) { IForgeRegistry r = event.getRegistry(); - r.register(new BlockMicroMaterial(ExplorationReferences.MARBLE_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.MARBLE_BRICK_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.BASALT_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.BASALT_COBBLE_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.BASALT_BRICK_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.RUBY_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.SAPPHIRE_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.PERIDOT_BLOCK)); - r.register(new BlockMicroMaterial(ExplorationReferences.ELECTROTINE_BLOCK)); + r.register(new BlockMicroMaterial(MARBLE_BLOCK.get())); + r.register(new BlockMicroMaterial(MARBLE_BRICK_BLOCK.get())); + r.register(new BlockMicroMaterial(BASALT_BLOCK.get())); + r.register(new BlockMicroMaterial(BASALT_COBBLE_BLOCK.get())); + r.register(new BlockMicroMaterial(BASALT_BRICK_BLOCK.get())); + r.register(new BlockMicroMaterial(RUBY_BLOCK.get())); + r.register(new BlockMicroMaterial(SAPPHIRE_BLOCK.get())); + r.register(new BlockMicroMaterial(PERIDOT_BLOCK.get())); + r.register(new BlockMicroMaterial(ELECTROTINE_BLOCK.get())); } private static Block createOreBlock(boolean isDeepslate, int minxp, int maxxp) { @@ -185,7 +222,7 @@ private static Block createElectrotineOreBlock(boolean isDeepslate, int minxp, i .sound(isDeepslate ? SoundType.DEEPSLATE : SoundType.STONE), UniformInt.of(minxp, maxxp)); } - private static Block createWallBlock(RegistryObject block) { + private static WallBlock createWallBlock(RegistryObject block) { return new WallBlock(BlockBehaviour.Properties.copy(block.get())); } @@ -210,7 +247,7 @@ private static Block createDecorativeMetalBlock(float hardness, float resistance .sound(SoundType.METAL)); } - private static Item createBlockItem(RegistryObject block) { + private static Item createBlockItem(RegistryObject block) { return new BlockItem(block.get(), new Item.Properties().tab(EXPLORATION_CREATIVE_TAB)); } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationClientInit.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationClientInit.java index 10da84084..2f1362361 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationClientInit.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationClientInit.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import static mrtjp.projectred.exploration.init.ExplorationReferences.BACKPACK_CONTAINER; +import static mrtjp.projectred.exploration.init.ExplorationMenus.BACKPACK_CONTAINER; public class ExplorationClientInit { @@ -19,6 +19,6 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { // Register screens - MenuScreens.register(BACKPACK_CONTAINER, BackpackScreen::new); + MenuScreens.register(BACKPACK_CONTAINER.get(), BackpackScreen::new); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationContainers.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationContainers.java deleted file mode 100644 index 155ddec2d..000000000 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationContainers.java +++ /dev/null @@ -1,16 +0,0 @@ -package mrtjp.projectred.exploration.init; - -import codechicken.lib.inventory.container.ICCLContainerType; -import mrtjp.projectred.exploration.inventory.container.BackpackContainer; - -import static mrtjp.projectred.exploration.ProjectRedExploration.CONTAINERS; - -public class ExplorationContainers { - - public static final String ID_BACKPACK_CONTAINER = "backpack"; - - public static void register() { - - CONTAINERS.register(ID_BACKPACK_CONTAINER, () -> ICCLContainerType.create(BackpackContainer.FACTORY)); - } -} diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java index 37b9a15f3..22a965e42 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java @@ -11,12 +11,14 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.*; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.registries.RegistryObject; import java.util.function.Supplier; import static mrtjp.projectred.core.init.CoreTags.*; import static mrtjp.projectred.exploration.ProjectRedExploration.*; +@SuppressWarnings("NotNullFieldNotInitialized") public class ExplorationItems { public static final String ID_RAW_TIN = "raw_tin"; @@ -94,6 +96,85 @@ public class ExplorationItems { public static final String ID_RED_BACKPACK = "red_backpack"; public static final String ID_BLACK_BACKPACK = "black_backpack"; + // Ingots / dusts / gems + public static RegistryObject RAW_TIN_ITEM; + public static RegistryObject TIN_INGOT_ITEM; + public static RegistryObject RAW_SILVER_ITEM; + public static RegistryObject SILVER_INGOT_ITEM; + + public static RegistryObject WOOL_GIN; + public static RegistryObject ATHAME; + + // Tools + public static RegistryObject RUBY_AXE; + public static RegistryObject SAPPHIRE_AXE; + public static RegistryObject PERIDOT_AXE; + + public static RegistryObject RUBY_PICKAXE; + public static RegistryObject SAPPHIRE_PICKAXE; + public static RegistryObject PERIDOT_PICKAXE; + + public static RegistryObject RUBY_SHOVEL; + public static RegistryObject SAPPHIRE_SHOVEL; + public static RegistryObject PERIDOT_SHOVEL; + + public static RegistryObject RUBY_HOE; + public static RegistryObject SAPPHIRE_HOE; + public static RegistryObject PERIDOT_HOE; + + public static RegistryObject RUBY_SWORD; + public static RegistryObject SAPPHIRE_SWORD; + public static RegistryObject PERIDOT_SWORD; + + public static RegistryObject GOLD_SAW; + public static RegistryObject RUBY_SAW; + public static RegistryObject SAPPHIRE_SAW; + public static RegistryObject PERIDOT_SAW; + + public static RegistryObject WOOD_SICKLE; + public static RegistryObject STONE_SICKLE; + public static RegistryObject IRON_SICKLE; + public static RegistryObject GOLD_SICKLE; + public static RegistryObject DIAMOND_SICKLE; + public static RegistryObject RUBY_SICKLE; + public static RegistryObject SAPPHIRE_SICKLE; + public static RegistryObject PERIDOT_SICKLE; + + // Armor + public static RegistryObject RUBY_HELMET; + public static RegistryObject SAPPHIRE_HELMET; + public static RegistryObject PERIDOT_HELMET; + + public static RegistryObject RUBY_CHESTPLATE; + public static RegistryObject SAPPHIRE_CHESTPLATE; + public static RegistryObject PERIDOT_CHESTPLATE; + + public static RegistryObject RUBY_LEGGINGS; + public static RegistryObject SAPPHIRE_LEGGINGS; + public static RegistryObject PERIDOT_LEGGINGS; + + public static RegistryObject RUBY_BOOTS; + public static RegistryObject SAPPHIRE_BOOTS; + public static RegistryObject PERIDOT_BOOTS; + + //Backpacks + public static RegistryObject WHITE_BACKPACK; + public static RegistryObject ORANGE_BACKPACK; + public static RegistryObject MAGENTA_BACKPACK; + public static RegistryObject LIGHT_BLUE_BACKPACK; + public static RegistryObject YELLOW_BACKPACK; + public static RegistryObject LIME_BACKPACK; + public static RegistryObject PINK_BACKPACK; + public static RegistryObject GRAY_BACKPACK; + public static RegistryObject LIGHT_GRAY_BACKPACK; + public static RegistryObject CYAN_BACKPACK; + public static RegistryObject PURPLE_BACKPACK; + public static RegistryObject BLUE_BACKPACK; + public static RegistryObject BROWN_BACKPACK; + public static RegistryObject GREEN_BACKPACK; + public static RegistryObject RED_BACKPACK; + public static RegistryObject BLACK_BACKPACK; + public static final SimpleItemTier ATHAME_ITEM_TIER = SimpleItemTier.builder(Tiers.DIAMOND) .maxUses(100) .enchantability(30) @@ -160,86 +241,86 @@ public class ExplorationItems { public static void register() { // Ingots/dusts/gems - ITEMS.register(ID_RAW_TIN, createSimpleItemSupplier()); - ITEMS.register(ID_TIN_INGOT, createSimpleItemSupplier()); - ITEMS.register(ID_RAW_SILVER, createSimpleItemSupplier()); - ITEMS.register(ID_SILVER_INGOT, createSimpleItemSupplier()); + RAW_TIN_ITEM = ITEMS.register(ID_RAW_TIN, createSimpleItemSupplier()); + TIN_INGOT_ITEM = ITEMS.register(ID_TIN_INGOT, createSimpleItemSupplier()); + RAW_SILVER_ITEM = ITEMS.register(ID_RAW_SILVER, createSimpleItemSupplier()); + SILVER_INGOT_ITEM = ITEMS.register(ID_SILVER_INGOT, createSimpleItemSupplier()); - ITEMS.register(ID_WOOL_GIN, WoolGinItem::new); - ITEMS.register(ID_ATHAME, () -> new AthameItem(ATHAME_ITEM_TIER, 3, -2.4F)); + WOOL_GIN = ITEMS.register(ID_WOOL_GIN, WoolGinItem::new); + ATHAME = ITEMS.register(ID_ATHAME, () -> new AthameItem(ATHAME_ITEM_TIER, 3, -2.4F)); /* Tools */ - ITEMS.register(ID_RUBY_AXE, () -> createAxeItem(RUBY_ITEM_TIER, 5.0F, -3.0F)); - ITEMS.register(ID_SAPPHIRE_AXE, () -> createAxeItem(SAPPHIRE_ITEM_TIER, 5.0F, -3.0F)); - ITEMS.register(ID_PERIDOT_AXE, () -> createAxeItem(PERIDOT_ITEM_TIER, 5.0F, -3.0F)); + RUBY_AXE = ITEMS.register(ID_RUBY_AXE, () -> createAxeItem(RUBY_ITEM_TIER, 5.0F, -3.0F)); + SAPPHIRE_AXE = ITEMS.register(ID_SAPPHIRE_AXE, () -> createAxeItem(SAPPHIRE_ITEM_TIER, 5.0F, -3.0F)); + PERIDOT_AXE = ITEMS.register(ID_PERIDOT_AXE, () -> createAxeItem(PERIDOT_ITEM_TIER, 5.0F, -3.0F)); - ITEMS.register(ID_RUBY_PICKAXE, () -> createPickaxeItem(RUBY_ITEM_TIER, 1, -2.8F)); - ITEMS.register(ID_SAPPHIRE_PICKAXE, () -> createPickaxeItem(SAPPHIRE_ITEM_TIER, 1, -2.8F)); - ITEMS.register(ID_PERIDOT_PICKAXE, () -> createPickaxeItem(PERIDOT_ITEM_TIER, 1, -2.8F)); + RUBY_PICKAXE = ITEMS.register(ID_RUBY_PICKAXE, () -> createPickaxeItem(RUBY_ITEM_TIER, 1, -2.8F)); + SAPPHIRE_PICKAXE = ITEMS.register(ID_SAPPHIRE_PICKAXE, () -> createPickaxeItem(SAPPHIRE_ITEM_TIER, 1, -2.8F)); + PERIDOT_PICKAXE = ITEMS.register(ID_PERIDOT_PICKAXE, () -> createPickaxeItem(PERIDOT_ITEM_TIER, 1, -2.8F)); - ITEMS.register(ID_RUBY_SHOVEL, () -> createShovelItem(RUBY_ITEM_TIER, 1.5F, -3.0F)); - ITEMS.register(ID_SAPPHIRE_SHOVEL, () -> createShovelItem(SAPPHIRE_ITEM_TIER, 1.5F, -3.0F)); - ITEMS.register(ID_PERIDOT_SHOVEL, () -> createShovelItem(PERIDOT_ITEM_TIER, 1.5F, -3.0F)); + RUBY_SHOVEL = ITEMS.register(ID_RUBY_SHOVEL, () -> createShovelItem(RUBY_ITEM_TIER, 1.5F, -3.0F)); + SAPPHIRE_SHOVEL = ITEMS.register(ID_SAPPHIRE_SHOVEL, () -> createShovelItem(SAPPHIRE_ITEM_TIER, 1.5F, -3.0F)); + PERIDOT_SHOVEL = ITEMS.register(ID_PERIDOT_SHOVEL, () -> createShovelItem(PERIDOT_ITEM_TIER, 1.5F, -3.0F)); - ITEMS.register(ID_RUBY_HOE, () -> createHoeItem(RUBY_ITEM_TIER, -3, 0.0F)); - ITEMS.register(ID_SAPPHIRE_HOE, () -> createHoeItem(SAPPHIRE_ITEM_TIER, -3, 0.0F)); - ITEMS.register(ID_PERIDOT_HOE, () -> createHoeItem(PERIDOT_ITEM_TIER, -3, 0.0F)); + RUBY_HOE = ITEMS.register(ID_RUBY_HOE, () -> createHoeItem(RUBY_ITEM_TIER, -3, 0.0F)); + SAPPHIRE_HOE = ITEMS.register(ID_SAPPHIRE_HOE, () -> createHoeItem(SAPPHIRE_ITEM_TIER, -3, 0.0F)); + PERIDOT_HOE = ITEMS.register(ID_PERIDOT_HOE, () -> createHoeItem(PERIDOT_ITEM_TIER, -3, 0.0F)); - ITEMS.register(ID_RUBY_SWORD, () -> createSwordItem(RUBY_ITEM_TIER, 3, -2.4F)); - ITEMS.register(ID_SAPPHIRE_SWORD, () -> createSwordItem(SAPPHIRE_ITEM_TIER, 3, -2.4F)); - ITEMS.register(ID_PERIDOT_SWORD, () -> createSwordItem(PERIDOT_ITEM_TIER, 3, -2.4F)); + RUBY_SWORD = ITEMS.register(ID_RUBY_SWORD, () -> createSwordItem(RUBY_ITEM_TIER, 3, -2.4F)); + SAPPHIRE_SWORD = ITEMS.register(ID_SAPPHIRE_SWORD, () -> createSwordItem(SAPPHIRE_ITEM_TIER, 3, -2.4F)); + PERIDOT_SWORD = ITEMS.register(ID_PERIDOT_SWORD, () -> createSwordItem(PERIDOT_ITEM_TIER, 3, -2.4F)); - ITEMS.register(ID_GOLD_SAW, () -> createSawItem(Tiers.GOLD)); - ITEMS.register(ID_RUBY_SAW, () -> createSawItem(RUBY_ITEM_TIER)); - ITEMS.register(ID_SAPPHIRE_SAW, () -> createSawItem(SAPPHIRE_ITEM_TIER)); - ITEMS.register(ID_PERIDOT_SAW, () -> createSawItem(PERIDOT_ITEM_TIER)); + GOLD_SAW = ITEMS.register(ID_GOLD_SAW, () -> createSawItem(Tiers.GOLD)); + RUBY_SAW = ITEMS.register(ID_RUBY_SAW, () -> createSawItem(RUBY_ITEM_TIER)); + SAPPHIRE_SAW = ITEMS.register(ID_SAPPHIRE_SAW, () -> createSawItem(SAPPHIRE_ITEM_TIER)); + PERIDOT_SAW = ITEMS.register(ID_PERIDOT_SAW, () -> createSawItem(PERIDOT_ITEM_TIER)); - ITEMS.register(ID_WOOD_SICKLE, () -> createSickleItem(Tiers.WOOD, 1, -2.8F)); - ITEMS.register(ID_STONE_SICKLE, () -> createSickleItem(Tiers.STONE, 1, -2.8F)); - ITEMS.register(ID_IRON_SICKLE, () -> createSickleItem(Tiers.IRON, 1, -2.8F)); - ITEMS.register(ID_GOLD_SICKLE, () -> createSickleItem(Tiers.GOLD, 1, -2.8F)); - ITEMS.register(ID_DIAMOND_SICKLE, () -> createSickleItem(Tiers.DIAMOND, 1, -2.8F)); - ITEMS.register(ID_RUBY_SICKLE, () -> createSickleItem(RUBY_ITEM_TIER, 1, -2.8F)); - ITEMS.register(ID_SAPPHIRE_SICKLE,() -> createSickleItem(SAPPHIRE_ITEM_TIER, 1, -2.8F)); - ITEMS.register(ID_PERIDOT_SICKLE, () -> createSickleItem(PERIDOT_ITEM_TIER, 1, -2.8F)); + WOOD_SICKLE = ITEMS.register(ID_WOOD_SICKLE, () -> createSickleItem(Tiers.WOOD, 1, -2.8F)); + STONE_SICKLE = ITEMS.register(ID_STONE_SICKLE, () -> createSickleItem(Tiers.STONE, 1, -2.8F)); + IRON_SICKLE = ITEMS.register(ID_IRON_SICKLE, () -> createSickleItem(Tiers.IRON, 1, -2.8F)); + GOLD_SICKLE = ITEMS.register(ID_GOLD_SICKLE, () -> createSickleItem(Tiers.GOLD, 1, -2.8F)); + DIAMOND_SICKLE = ITEMS.register(ID_DIAMOND_SICKLE, () -> createSickleItem(Tiers.DIAMOND, 1, -2.8F)); + RUBY_SICKLE = ITEMS.register(ID_RUBY_SICKLE, () -> createSickleItem(RUBY_ITEM_TIER, 1, -2.8F)); + SAPPHIRE_SICKLE = ITEMS.register(ID_SAPPHIRE_SICKLE, () -> createSickleItem(SAPPHIRE_ITEM_TIER, 1, -2.8F)); + PERIDOT_SICKLE = ITEMS.register(ID_PERIDOT_SICKLE, () -> createSickleItem(PERIDOT_ITEM_TIER, 1, -2.8F)); /* Armmor */ - ITEMS.register(ID_RUBY_HELMET, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.HEAD)); - ITEMS.register(ID_SAPPHIRE_HELMET, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.HEAD)); - ITEMS.register(ID_PERIDOT_HELMET, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.HEAD)); + RUBY_HELMET = ITEMS.register(ID_RUBY_HELMET, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.HEAD)); + SAPPHIRE_HELMET = ITEMS.register(ID_SAPPHIRE_HELMET, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.HEAD)); + PERIDOT_HELMET = ITEMS.register(ID_PERIDOT_HELMET, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.HEAD)); - ITEMS.register(ID_RUBY_CHESTPLATE, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.CHEST)); - ITEMS.register(ID_SAPPHIRE_CHESTPLATE, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.CHEST)); - ITEMS.register(ID_PERIDOT_CHESTPLATE, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.CHEST)); + RUBY_CHESTPLATE = ITEMS.register(ID_RUBY_CHESTPLATE, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.CHEST)); + SAPPHIRE_CHESTPLATE = ITEMS.register(ID_SAPPHIRE_CHESTPLATE, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.CHEST)); + PERIDOT_CHESTPLATE = ITEMS.register(ID_PERIDOT_CHESTPLATE, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.CHEST)); - ITEMS.register(ID_RUBY_LEGGINGS, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.LEGS)); - ITEMS.register(ID_SAPPHIRE_LEGGINGS, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.LEGS)); - ITEMS.register(ID_PERIDOT_LEGGINGS, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.LEGS)); + RUBY_LEGGINGS = ITEMS.register(ID_RUBY_LEGGINGS, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.LEGS)); + SAPPHIRE_LEGGINGS = ITEMS.register(ID_SAPPHIRE_LEGGINGS, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.LEGS)); + PERIDOT_LEGGINGS = ITEMS.register(ID_PERIDOT_LEGGINGS, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.LEGS)); - ITEMS.register(ID_RUBY_BOOTS, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.FEET)); - ITEMS.register(ID_SAPPHIRE_BOOTS, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.FEET)); - ITEMS.register(ID_PERIDOT_BOOTS, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.FEET)); + RUBY_BOOTS = ITEMS.register(ID_RUBY_BOOTS, () -> createArmorItem(RUBY_ARMOR_MATERIAL, EquipmentSlot.FEET)); + SAPPHIRE_BOOTS = ITEMS.register(ID_SAPPHIRE_BOOTS, () -> createArmorItem(SAPPHIRE_ARMOR_MATERIAL, EquipmentSlot.FEET)); + PERIDOT_BOOTS = ITEMS.register(ID_PERIDOT_BOOTS, () -> createArmorItem(PERIDOT_ARMOR_MATERIAL, EquipmentSlot.FEET)); /* Backpacks */ - ITEMS.register(ID_WHITE_BACKPACK, () -> new BackpackItem(0)); - ITEMS.register(ID_ORANGE_BACKPACK, () -> new BackpackItem(1)); - ITEMS.register(ID_MAGENTA_BACKPACK, () -> new BackpackItem(2)); - ITEMS.register(ID_LIGHT_BLUE_BACKPACK, () -> new BackpackItem(3)); - ITEMS.register(ID_YELLOW_BACKPACK, () -> new BackpackItem(4)); - ITEMS.register(ID_LIME_BACKPACK, () -> new BackpackItem(5)); - ITEMS.register(ID_PINK_BACKPACK, () -> new BackpackItem(6)); - ITEMS.register(ID_GRAY_BACKPACK, () -> new BackpackItem(7)); - ITEMS.register(ID_LIGHT_GRAY_BACKPACK, () -> new BackpackItem(8)); - ITEMS.register(ID_CYAN_BACKPACK, () -> new BackpackItem(9)); - ITEMS.register(ID_PURPLE_BACKPACK, () -> new BackpackItem(10)); - ITEMS.register(ID_BLUE_BACKPACK, () -> new BackpackItem(11)); - ITEMS.register(ID_BROWN_BACKPACK, () -> new BackpackItem(12)); - ITEMS.register(ID_GREEN_BACKPACK, () -> new BackpackItem(13)); - ITEMS.register(ID_RED_BACKPACK, () -> new BackpackItem(14)); - ITEMS.register(ID_BLACK_BACKPACK, () -> new BackpackItem(15)); + WHITE_BACKPACK = ITEMS.register(ID_WHITE_BACKPACK, () -> new BackpackItem(0)); + ORANGE_BACKPACK = ITEMS.register(ID_ORANGE_BACKPACK, () -> new BackpackItem(1)); + MAGENTA_BACKPACK = ITEMS.register(ID_MAGENTA_BACKPACK, () -> new BackpackItem(2)); + LIGHT_BLUE_BACKPACK = ITEMS.register(ID_LIGHT_BLUE_BACKPACK, () -> new BackpackItem(3)); + YELLOW_BACKPACK = ITEMS.register(ID_YELLOW_BACKPACK, () -> new BackpackItem(4)); + LIME_BACKPACK = ITEMS.register(ID_LIME_BACKPACK, () -> new BackpackItem(5)); + PINK_BACKPACK = ITEMS.register(ID_PINK_BACKPACK, () -> new BackpackItem(6)); + GRAY_BACKPACK = ITEMS.register(ID_GRAY_BACKPACK, () -> new BackpackItem(7)); + LIGHT_GRAY_BACKPACK = ITEMS.register(ID_LIGHT_GRAY_BACKPACK, () -> new BackpackItem(8)); + CYAN_BACKPACK = ITEMS.register(ID_CYAN_BACKPACK, () -> new BackpackItem(9)); + PURPLE_BACKPACK = ITEMS.register(ID_PURPLE_BACKPACK, () -> new BackpackItem(10)); + BLUE_BACKPACK = ITEMS.register(ID_BLUE_BACKPACK, () -> new BackpackItem(11)); + BROWN_BACKPACK = ITEMS.register(ID_BROWN_BACKPACK, () -> new BackpackItem(12)); + GREEN_BACKPACK = ITEMS.register(ID_GREEN_BACKPACK, () -> new BackpackItem(13)); + RED_BACKPACK = ITEMS.register(ID_RED_BACKPACK, () -> new BackpackItem(14)); + BLACK_BACKPACK = ITEMS.register(ID_BLACK_BACKPACK, () -> new BackpackItem(15)); } private static Supplier createSimpleItemSupplier() { @@ -277,4 +358,28 @@ private static Item createSickleItem(Tier tier, int attackDamage, float attackSp private static Item createArmorItem(SimpleArmorMaterial material, EquipmentSlot slot) { return new ArmorItem(material, slot, new Item.Properties().tab(EXPLORATION_CREATIVE_TAB)); } + + //region Utilities + public static Item getBackpackByColor(int color) { + return switch (color) { + case 0 -> WHITE_BACKPACK.get(); + case 1 -> ORANGE_BACKPACK.get(); + case 2 -> MAGENTA_BACKPACK.get(); + case 3 -> LIGHT_BLUE_BACKPACK.get(); + case 4 -> YELLOW_BACKPACK.get(); + case 5 -> LIME_BACKPACK.get(); + case 6 -> PINK_BACKPACK.get(); + case 7 -> GRAY_BACKPACK.get(); + case 8 -> LIGHT_GRAY_BACKPACK.get(); + case 9 -> CYAN_BACKPACK.get(); + case 10 -> PURPLE_BACKPACK.get(); + case 11 -> BLUE_BACKPACK.get(); + case 12 -> BROWN_BACKPACK.get(); + case 13 -> GREEN_BACKPACK.get(); + case 14 -> RED_BACKPACK.get(); + case 15 -> BLACK_BACKPACK.get(); + default -> throw new IllegalArgumentException("Invalid color: " + color); + }; + } + //endregion } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationMenus.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationMenus.java new file mode 100644 index 000000000..fc56bb5ce --- /dev/null +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationMenus.java @@ -0,0 +1,21 @@ +package mrtjp.projectred.exploration.init; + +import codechicken.lib.inventory.container.ICCLContainerType; +import mrtjp.projectred.exploration.inventory.container.BackpackContainer; +import net.minecraft.world.inventory.MenuType; +import net.minecraftforge.registries.RegistryObject; + +import static mrtjp.projectred.exploration.ProjectRedExploration.MENU_TYPES; + +@SuppressWarnings("NotNullFieldNotInitialized") +public class ExplorationMenus { + + public static final String ID_BACKPACK_CONTAINER = "backpack"; + + public static RegistryObject> BACKPACK_CONTAINER; + + public static void register() { + + BACKPACK_CONTAINER = MENU_TYPES.register(ID_BACKPACK_CONTAINER, () -> ICCLContainerType.create(BackpackContainer.FACTORY)); + } +} diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationRecipeSerializers.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationRecipeSerializers.java index 2f04e4b58..3a9905310 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationRecipeSerializers.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationRecipeSerializers.java @@ -2,15 +2,19 @@ import mrtjp.projectred.exploration.item.crafting.BackpackDyeRecipe; import net.minecraft.world.item.crafting.SimpleRecipeSerializer; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.exploration.ProjectRedExploration.RECIPE_SERIALIZERS; +@SuppressWarnings("NotNullFieldNotInitialized") public class ExplorationRecipeSerializers { public static final String ID_BACKPACK_DYE = "backpack_dye"; + public static RegistryObject> BACKPACK_DYE_RECIPE_SERIALIZER; + public static void register() { - RECIPE_SERIALIZERS.register(ID_BACKPACK_DYE, () -> new SimpleRecipeSerializer<>(BackpackDyeRecipe::new)); + BACKPACK_DYE_RECIPE_SERIALIZER = RECIPE_SERIALIZERS.register(ID_BACKPACK_DYE, () -> new SimpleRecipeSerializer<>(BackpackDyeRecipe::new)); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationReferences.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationReferences.java deleted file mode 100644 index 25e21b30e..000000000 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationReferences.java +++ /dev/null @@ -1,268 +0,0 @@ -package mrtjp.projectred.exploration.init; - -import mrtjp.projectred.exploration.inventory.container.BackpackContainer; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.SimpleRecipeSerializer; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.WallBlock; -import net.minecraftforge.registries.ObjectHolder; - -import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; -import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; -import static mrtjp.projectred.exploration.init.ExplorationContainers.ID_BACKPACK_CONTAINER; -import static mrtjp.projectred.exploration.init.ExplorationItems.*; -import static mrtjp.projectred.exploration.init.ExplorationRecipeSerializers.ID_BACKPACK_DYE; - -@ObjectHolder(MOD_ID) -@SuppressWarnings("NotNullFieldNotInitialized") -public class ExplorationReferences { - - /* Blocks */ - - // Ores - @ObjectHolder(ID_RUBY_ORE) - public static Block RUBY_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_RUBY_ORE) - public static Block DEEPSLATE_RUBY_ORE_BLOCK; - @ObjectHolder(ID_SAPPHIRE_ORE) - public static Block SAPPHIRE_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_SAPPHIRE_ORE) - public static Block DEEPSLATE_SAPPHIRE_ORE_BLOCK; - @ObjectHolder(ID_PERIDOT_ORE) - public static Block PERIDOT_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_PERIDOT_ORE) - public static Block DEEPSLATE_PERIDOT_ORE_BLOCK; - @ObjectHolder(ID_TIN_ORE) - public static Block TIN_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_TIN_ORE) - public static Block DEEPSLATE_TIN_ORE_BLOCK; - @ObjectHolder(ID_SILVER_ORE) - public static Block SILVER_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_SILVER_ORE) - public static Block DEEPSLATE_SILVER_ORE_BLOCK; - @ObjectHolder(ID_ELECTROTINE_ORE) - public static Block ELECTROTINE_ORE_BLOCK; - @ObjectHolder(ID_DEEPSLATE_ELECTROTINE_ORE) - public static Block DEEPSLATE_ELECTROTINE_ORE_BLOCK; - - // Decorative blocks - @ObjectHolder(ID_MARBLE) - public static Block MARBLE_BLOCK; - @ObjectHolder(ID_MARBLE_BRICK) - public static Block MARBLE_BRICK_BLOCK; - @ObjectHolder(ID_BASALT) - public static Block BASALT_BLOCK; - @ObjectHolder(ID_BASALT_COBBLE) - public static Block BASALT_COBBLE_BLOCK; - @ObjectHolder(ID_BASALT_BRICK) - public static Block BASALT_BRICK_BLOCK; - @ObjectHolder(ID_RUBY_BLOCK) - public static Block RUBY_BLOCK; - @ObjectHolder(ID_SAPPHIRE_BLOCK) - public static Block SAPPHIRE_BLOCK; - @ObjectHolder(ID_PERIDOT_BLOCK) - public static Block PERIDOT_BLOCK; - @ObjectHolder(ID_ELECTROTINE_BLOCK) - public static Block ELECTROTINE_BLOCK; - @ObjectHolder(ID_RAW_TIN_BLOCK) - public static Block RAW_TIN_BLOCK; - @ObjectHolder(ID_RAW_SILVER_BLOCK) - public static Block RAW_SILVER_BLOCK; - @ObjectHolder(ID_TIN_BLOCK) - public static Block TIN_BLOCK; - @ObjectHolder(ID_SILVER_BLOCK) - public static Block SILVER_BLOCK; - - // Walls - @ObjectHolder(ID_MARBLE_WALL) - public static WallBlock MARBLE_WALL; - @ObjectHolder(ID_MARBLE_BRICK_WALL) - public static WallBlock MARBLE_BRICK_WALL; - @ObjectHolder(ID_BASALT_WALL) - public static WallBlock BASALT_WALL; - @ObjectHolder(ID_BASALT_COBBLE_WALL) - public static WallBlock BASALT_COBBLE_WALL; - @ObjectHolder(ID_BASALT_BRICK_WALL) - public static WallBlock BASALT_BRICK_WALL; - @ObjectHolder(ID_RUBY_BLOCK_WALL) - public static WallBlock RUBY_BLOCK_WALL; - @ObjectHolder(ID_SAPPHIRE_BLOCK_WALL) - public static WallBlock SAPPHIRE_BLOCK_WALL; - @ObjectHolder(ID_PERIDOT_BLOCK_WALL) - public static WallBlock PERIDOT_BLOCK_WALL; - @ObjectHolder(ID_ELECTROTINE_BLOCK_WALL) - public static WallBlock ELECTROTINE_BLOCK_WALL; - - /* Items */ - - // Ingots / dusts / gems - @ObjectHolder(ID_RAW_TIN) - public static Item RAW_TIN_ITEM; - @ObjectHolder(ID_TIN_INGOT) - public static Item TIN_INGOT_ITEM; - @ObjectHolder(ID_RAW_SILVER) - public static Item RAW_SILVER_ITEM; - @ObjectHolder(ID_SILVER_INGOT) - public static Item SILVER_INGOT_ITEM; - - @ObjectHolder(ID_WOOL_GIN) - public static Item WOOL_GIN; - @ObjectHolder(ID_ATHAME) - public static Item ATHAME; - - // Tools - @ObjectHolder(ID_RUBY_AXE) - public static Item RUBY_AXE; - @ObjectHolder(ID_SAPPHIRE_AXE) - public static Item SAPPHIRE_AXE; - @ObjectHolder(ID_PERIDOT_AXE) - public static Item PERIDOT_AXE; - - @ObjectHolder(ID_RUBY_PICKAXE) - public static Item RUBY_PICKAXE; - @ObjectHolder(ID_SAPPHIRE_PICKAXE) - public static Item SAPPHIRE_PICKAXE; - @ObjectHolder(ID_PERIDOT_PICKAXE) - public static Item PERIDOT_PICKAXE; - - @ObjectHolder(ID_RUBY_SHOVEL) - public static Item RUBY_SHOVEL; - @ObjectHolder(ID_SAPPHIRE_SHOVEL) - public static Item SAPPHIRE_SHOVEL; - @ObjectHolder(ID_PERIDOT_SHOVEL) - public static Item PERIDOT_SHOVEL; - - @ObjectHolder(ID_RUBY_HOE) - public static Item RUBY_HOE; - @ObjectHolder(ID_SAPPHIRE_HOE) - public static Item SAPPHIRE_HOE; - @ObjectHolder(ID_PERIDOT_HOE) - public static Item PERIDOT_HOE; - - @ObjectHolder(ID_RUBY_SWORD) - public static Item RUBY_SWORD; - @ObjectHolder(ID_SAPPHIRE_SWORD) - public static Item SAPPHIRE_SWORD; - @ObjectHolder(ID_PERIDOT_SWORD) - public static Item PERIDOT_SWORD; - - @ObjectHolder(ID_GOLD_SAW) - public static Item GOLD_SAW; - @ObjectHolder(ID_RUBY_SAW) - public static Item RUBY_SAW; - @ObjectHolder(ID_SAPPHIRE_SAW) - public static Item SAPPHIRE_SAW; - @ObjectHolder(ID_PERIDOT_SAW) - public static Item PERIDOT_SAW; - - @ObjectHolder(ID_WOOD_SICKLE) - public static Item WOOD_SICKLE; - @ObjectHolder(ID_STONE_SICKLE) - public static Item STONE_SICKLE; - @ObjectHolder(ID_IRON_SICKLE) - public static Item IRON_SICKLE; - @ObjectHolder(ID_GOLD_SICKLE) - public static Item GOLD_SICKLE; - @ObjectHolder(ID_DIAMOND_SICKLE) - public static Item DIAMOND_SICKLE; - @ObjectHolder(ID_RUBY_SICKLE) - public static Item RUBY_SICKLE; - @ObjectHolder(ID_SAPPHIRE_SICKLE) - public static Item SAPPHIRE_SICKLE; - @ObjectHolder(ID_PERIDOT_SICKLE) - public static Item PERIDOT_SICKLE; - - // Armor - @ObjectHolder(ID_RUBY_HELMET) - public static Item RUBY_HELMET; - @ObjectHolder(ID_SAPPHIRE_HELMET) - public static Item SAPPHIRE_HELMET; - @ObjectHolder(ID_PERIDOT_HELMET) - public static Item PERIDOT_HELMET; - - @ObjectHolder(ID_RUBY_CHESTPLATE) - public static Item RUBY_CHESTPLATE; - @ObjectHolder(ID_SAPPHIRE_CHESTPLATE) - public static Item SAPPHIRE_CHESTPLATE; - @ObjectHolder(ID_PERIDOT_CHESTPLATE) - public static Item PERIDOT_CHESTPLATE; - - @ObjectHolder(ID_RUBY_LEGGINGS) - public static Item RUBY_LEGGINGS; - @ObjectHolder(ID_SAPPHIRE_LEGGINGS) - public static Item SAPPHIRE_LEGGINGS; - @ObjectHolder(ID_PERIDOT_LEGGINGS) - public static Item PERIDOT_LEGGINGS; - - @ObjectHolder(ID_RUBY_BOOTS) - public static Item RUBY_BOOTS; - @ObjectHolder(ID_SAPPHIRE_BOOTS) - public static Item SAPPHIRE_BOOTS; - @ObjectHolder(ID_PERIDOT_BOOTS) - public static Item PERIDOT_BOOTS; - - //Backpacks - @ObjectHolder(ID_WHITE_BACKPACK) - public static Item WHITE_BACKPACK; - @ObjectHolder(ID_ORANGE_BACKPACK) - public static Item ORANGE_BACKPACK; - @ObjectHolder(ID_MAGENTA_BACKPACK) - public static Item MAGENTA_BACKPACK; - @ObjectHolder(ID_LIGHT_BLUE_BACKPACK) - public static Item LIGHT_BLUE_BACKPACK; - @ObjectHolder(ID_YELLOW_BACKPACK) - public static Item YELLOW_BACKPACK; - @ObjectHolder(ID_LIME_BACKPACK) - public static Item LIME_BACKPACK; - @ObjectHolder(ID_PINK_BACKPACK) - public static Item PINK_BACKPACK; - @ObjectHolder(ID_GRAY_BACKPACK) - public static Item GRAY_BACKPACK; - @ObjectHolder(ID_LIGHT_GRAY_BACKPACK) - public static Item LIGHT_GRAY_BACKPACK; - @ObjectHolder(ID_CYAN_BACKPACK) - public static Item CYAN_BACKPACK; - @ObjectHolder(ID_PURPLE_BACKPACK) - public static Item PURPLE_BACKPACK; - @ObjectHolder(ID_BLUE_BACKPACK) - public static Item BLUE_BACKPACK; - @ObjectHolder(ID_BROWN_BACKPACK) - public static Item BROWN_BACKPACK; - @ObjectHolder(ID_GREEN_BACKPACK) - public static Item GREEN_BACKPACK; - @ObjectHolder(ID_RED_BACKPACK) - public static Item RED_BACKPACK; - @ObjectHolder(ID_BLACK_BACKPACK) - public static Item BLACK_BACKPACK; - - /* Containers */ - @ObjectHolder(ID_BACKPACK_CONTAINER) - public static MenuType BACKPACK_CONTAINER; - - /* Recipe Serializers */ - @ObjectHolder(ID_BACKPACK_DYE) - public static SimpleRecipeSerializer BACKPACK_DYE_RECIPE_SERIALIZER; - - public static Item getBackpackByColor(int color) { - switch (color) { - case 0: return WHITE_BACKPACK; - case 1: return ORANGE_BACKPACK; - case 2: return MAGENTA_BACKPACK; - case 3: return LIGHT_BLUE_BACKPACK; - case 4: return YELLOW_BACKPACK; - case 5: return LIME_BACKPACK; - case 6: return PINK_BACKPACK; - case 7: return GRAY_BACKPACK; - case 8: return LIGHT_GRAY_BACKPACK; - case 9: return CYAN_BACKPACK; - case 10: return PURPLE_BACKPACK; - case 11: return BLUE_BACKPACK; - case 12: return BROWN_BACKPACK; - case 13: return GREEN_BACKPACK; - case 14: return RED_BACKPACK; - case 15: return BLACK_BACKPACK; - default: throw new RuntimeException(); - } - } -} diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationWorldFeatures.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationWorldFeatures.java index d89ea6a84..605205bd6 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationWorldFeatures.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationWorldFeatures.java @@ -32,7 +32,7 @@ import static mrtjp.projectred.exploration.ProjectRedExploration.MOD_ID; import static mrtjp.projectred.exploration.ProjectRedExploration.WORLD_CARVERS; -import static mrtjp.projectred.exploration.init.ExplorationReferences.*; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.*; import static net.minecraft.world.level.biome.Biome.BiomeCategory.*; @SuppressWarnings("NotNullFieldNotInitialized") @@ -63,12 +63,12 @@ public static void load() { // Load configurations of Ore features and world carvers. Happens during common init because there is no Forge registry for this // Create features - Holder> RUBY_ORE_CONFIGURED_FEATURE = registerOreConfiguration("ruby_ore", RUBY_ORE_BLOCK, DEEPSLATE_RUBY_ORE_BLOCK, Configurator.gen_RubyVeinSize); - Holder> SAPPHIRE_ORE_CONFIGURED_FEATURE = registerOreConfiguration("sapphire_ore", SAPPHIRE_ORE_BLOCK, DEEPSLATE_SAPPHIRE_ORE_BLOCK, Configurator.gen_SapphireVeinSize); - Holder> PERIDOT_ORE_CONFIGURED_FEATURE = registerOreConfiguration("peridot_ore", PERIDOT_ORE_BLOCK, DEEPSLATE_PERIDOT_ORE_BLOCK, Configurator.gen_PeridotVeinSize); - Holder> ELECTROTINE_ORE_CONFIGURED_FEATURE = registerOreConfiguration("electrotine_ore", ELECTROTINE_ORE_BLOCK, DEEPSLATE_ELECTROTINE_ORE_BLOCK, Configurator.gen_ElectrotineVeinSize); - Holder> TIN_ORE_CONFIGURED_FEATURE = registerOreConfiguration("tin_ore", TIN_ORE_BLOCK, DEEPSLATE_TIN_ORE_BLOCK, Configurator.gen_TinVeinSize); - Holder> SILVER_ORE_CONFIGURED_FEATURE = registerOreConfiguration("silver_ore", SILVER_ORE_BLOCK, DEEPSLATE_SILVER_ORE_BLOCK, Configurator.gen_SilverVeinSize); + Holder> RUBY_ORE_CONFIGURED_FEATURE = registerOreConfiguration("ruby_ore", RUBY_ORE_BLOCK.get(), DEEPSLATE_RUBY_ORE_BLOCK.get(), Configurator.gen_RubyVeinSize); + Holder> SAPPHIRE_ORE_CONFIGURED_FEATURE = registerOreConfiguration("sapphire_ore", SAPPHIRE_ORE_BLOCK.get(), DEEPSLATE_SAPPHIRE_ORE_BLOCK.get(), Configurator.gen_SapphireVeinSize); + Holder> PERIDOT_ORE_CONFIGURED_FEATURE = registerOreConfiguration("peridot_ore", PERIDOT_ORE_BLOCK.get(), DEEPSLATE_PERIDOT_ORE_BLOCK.get(), Configurator.gen_PeridotVeinSize); + Holder> ELECTROTINE_ORE_CONFIGURED_FEATURE = registerOreConfiguration("electrotine_ore", ELECTROTINE_ORE_BLOCK.get(), DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), Configurator.gen_ElectrotineVeinSize); + Holder> TIN_ORE_CONFIGURED_FEATURE = registerOreConfiguration("tin_ore", TIN_ORE_BLOCK.get(), DEEPSLATE_TIN_ORE_BLOCK.get(), Configurator.gen_TinVeinSize); + Holder> SILVER_ORE_CONFIGURED_FEATURE = registerOreConfiguration("silver_ore", SILVER_ORE_BLOCK.get(), DEEPSLATE_SILVER_ORE_BLOCK.get(), Configurator.gen_SilverVeinSize); // Create placements RUBY_ORE_PLACED_FEATURE = createOrePlacements("ruby_ore", RUBY_ORE_CONFIGURED_FEATURE, -80, 80, 1); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/inventory/container/BackpackContainer.java b/exploration/src/main/java/mrtjp/projectred/exploration/inventory/container/BackpackContainer.java index 10c9006ad..facae307b 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/inventory/container/BackpackContainer.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/inventory/container/BackpackContainer.java @@ -1,6 +1,7 @@ package mrtjp.projectred.exploration.inventory.container; import codechicken.lib.inventory.container.ICCLContainerFactory; +import mrtjp.projectred.exploration.init.ExplorationMenus; import mrtjp.projectred.exploration.inventory.BackpackInventory; import mrtjp.projectred.exploration.item.BackpackItem; import mrtjp.projectred.lib.InventoryLib; @@ -12,7 +13,6 @@ import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import static mrtjp.projectred.exploration.init.ExplorationReferences.BACKPACK_CONTAINER; public class BackpackContainer extends AbstractContainerMenu { @@ -23,7 +23,7 @@ public class BackpackContainer extends AbstractContainerMenu { private final Inventory playerInventory; public BackpackContainer(int windowId, Inventory playerInventory) { - super(BACKPACK_CONTAINER, windowId); + super(ExplorationMenus.BACKPACK_CONTAINER.get(), windowId); this.playerInventory = playerInventory; diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/item/crafting/BackpackDyeRecipe.java b/exploration/src/main/java/mrtjp/projectred/exploration/item/crafting/BackpackDyeRecipe.java index 1dc475ea2..f3e498a5e 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/item/crafting/BackpackDyeRecipe.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/item/crafting/BackpackDyeRecipe.java @@ -1,5 +1,7 @@ package mrtjp.projectred.exploration.item.crafting; +import mrtjp.projectred.exploration.init.ExplorationItems; +import mrtjp.projectred.exploration.init.ExplorationRecipeSerializers; import mrtjp.projectred.exploration.item.BackpackItem; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.CraftingContainer; @@ -12,9 +14,6 @@ import java.util.Objects; -import static mrtjp.projectred.exploration.init.ExplorationReferences.BACKPACK_DYE_RECIPE_SERIALIZER; -import static mrtjp.projectred.exploration.init.ExplorationReferences.getBackpackByColor; - public class BackpackDyeRecipe extends CustomRecipe { public BackpackDyeRecipe(ResourceLocation id) { @@ -81,7 +80,7 @@ public ItemStack assemble(CraftingContainer inventory) { if (dyeColor == null || backpackColor == dyeColor) return ItemStack.EMPTY; - ItemStack result = new ItemStack(getBackpackByColor(dyeColor.getId())); + ItemStack result = new ItemStack(ExplorationItems.getBackpackByColor(dyeColor.getId())); if (backpack.hasTag()) { result.setTag(Objects.requireNonNull(backpack.getTag()).copy()); } @@ -96,6 +95,6 @@ public boolean canCraftInDimensions(int x, int y) { @Override public RecipeSerializer getSerializer() { - return BACKPACK_DYE_RECIPE_SERIALIZER; + return ExplorationRecipeSerializers.BACKPACK_DYE_RECIPE_SERIALIZER.get(); } } diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/world/gen/MarbleCaveWorldCarver.java b/exploration/src/main/java/mrtjp/projectred/exploration/world/gen/MarbleCaveWorldCarver.java index 864f31d27..80d6bd99c 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/world/gen/MarbleCaveWorldCarver.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/world/gen/MarbleCaveWorldCarver.java @@ -20,7 +20,7 @@ import java.util.function.Function; -import static mrtjp.projectred.exploration.init.ExplorationReferences.MARBLE_BLOCK; +import static mrtjp.projectred.exploration.init.ExplorationBlocks.MARBLE_BLOCK; public class MarbleCaveWorldCarver extends CaveWorldCarver { @@ -45,7 +45,7 @@ protected boolean carveBlock(CarvingContext context, CaveCarverConfiguration con if (carvedState.is(Blocks.AIR) || carvedState.is(Blocks.CAVE_AIR)) { - BlockState marbleState = MARBLE_BLOCK.defaultBlockState(); + BlockState marbleState = MARBLE_BLOCK.get().defaultBlockState(); for (int s = 0; s < 6; s++) { pos.set(pos1).move(Direction.values()[s]); diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/ProjectRedFabrication.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/ProjectRedFabrication.java index be535a819..8f501c379 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/ProjectRedFabrication.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/ProjectRedFabrication.java @@ -37,15 +37,15 @@ public class ProjectRedFabrication { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> TILE_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); + public static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); + public static final DeferredRegister> MENU_TYPES = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID); public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); - public static final SimpleCreativeTab FABRICATION_GROUP = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(FabricationReferences.IC_WORKBENCH_BLOCK)); + public static final SimpleCreativeTab FABRICATION_GROUP = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(FabricationBlocks.IC_WORKBENCH_BLOCK.get())); static { FabricationBlocks.register(); - FabricationContainers.register(); + FabricationMenus.register(); FabricationItems.register(); FabricationParts.register(); } @@ -60,8 +60,8 @@ public ProjectRedFabrication() { BLOCKS.register(modEventBus); ITEMS.register(modEventBus); - TILE_ENTITIES.register(modEventBus); - CONTAINERS.register(modEventBus); + BLOCK_ENTITY_TYPES.register(modEventBus); + MENU_TYPES.register(modEventBus); PARTS.register(modEventBus); } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/ICWorkbenchBlock.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/ICWorkbenchBlock.java index 629cfff28..589a6d8c4 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/ICWorkbenchBlock.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/ICWorkbenchBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.fabrication.block; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.tile.ICWorkbenchTile; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; @@ -36,7 +36,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return FabricationReferences.IC_WORKBENCH_TILE; + return FabricationBlocks.IC_WORKBENCH_TILE.get(); } @Override diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/LithographyTableBlock.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/LithographyTableBlock.java index 517a75f97..f2fe424c9 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/LithographyTableBlock.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/LithographyTableBlock.java @@ -1,6 +1,6 @@ package mrtjp.projectred.fabrication.block; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.tile.LithographyTableTile; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; @@ -22,6 +22,6 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return FabricationReferences.LITHOGRAPHY_TABLE_TILE; + return FabricationBlocks.LITHOGRAPHY_TABLE_TILE.get(); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PackagingTableBlock.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PackagingTableBlock.java index e8ec75cc3..fb21f7afd 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PackagingTableBlock.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PackagingTableBlock.java @@ -1,6 +1,6 @@ package mrtjp.projectred.fabrication.block; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.tile.PackagingTableTile; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; @@ -22,6 +22,6 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return FabricationReferences.PACKAGING_TABLE_TILE; + return FabricationBlocks.PACKAGING_TABLE_TILE.get(); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PlottingTableBlock.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PlottingTableBlock.java index a4257d119..717919d5e 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PlottingTableBlock.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/block/PlottingTableBlock.java @@ -1,7 +1,7 @@ package mrtjp.projectred.fabrication.block; import mrtjp.projectred.core.block.ProjectRedBlock; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.tile.PlottingTableTile; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity; @@ -23,6 +23,6 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected BlockEntityType getBlockEntityType() { - return FabricationReferences.PLOTTING_TABLE_TILE; + return FabricationBlocks.PLOTTING_TABLE_TILE.get(); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationBlockStateModelProvider.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationBlockStateModelProvider.java index f3a6fe4f5..d8ef3f0fb 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationBlockStateModelProvider.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationBlockStateModelProvider.java @@ -14,7 +14,7 @@ import javax.annotation.Nonnull; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; @SuppressWarnings("DataFlowIssue") public class FabricationBlockStateModelProvider extends BlockStateProvider { @@ -31,11 +31,11 @@ public FabricationBlockStateModelProvider(DataGenerator gen, ExistingFileHelper @Override protected void registerStatesAndModels() { - addICWorkbenchVariants(IC_WORKBENCH_BLOCK); + addICWorkbenchVariants(IC_WORKBENCH_BLOCK.get()); - addFabricationMachineVariants(PLOTTING_TABLE_BLOCK); - addFabricationMachineVariants(LITHOGRAPHY_TABLE_BLOCK); - addFabricationMachineVariants(PACKAGING_TABLE_BLOCK); + addFabricationMachineVariants(PLOTTING_TABLE_BLOCK.get()); + addFabricationMachineVariants(LITHOGRAPHY_TABLE_BLOCK.get()); + addFabricationMachineVariants(PACKAGING_TABLE_BLOCK.get()); } private void addICWorkbenchVariants(Block block) { diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java index 3ac91c622..89196c6eb 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationItemModelProvider.java @@ -5,7 +5,9 @@ import net.minecraftforge.common.data.ExistingFileHelper; import static mrtjp.projectred.fabrication.ProjectRedFabrication.MOD_ID; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; +import static mrtjp.projectred.fabrication.init.FabricationItems.*; +import static mrtjp.projectred.fabrication.init.FabricationParts.FABRICATED_GATE_ITEM; public class FabricationItemModelProvider extends ItemModelProvider { @@ -21,11 +23,11 @@ public String getName() { @Override protected void registerModels() { - simpleItemBlock(IC_WORKBENCH_BLOCK); + simpleItemBlock(IC_WORKBENCH_BLOCK.get()); - simpleItemBlock(PLOTTING_TABLE_BLOCK); - simpleItemBlock(LITHOGRAPHY_TABLE_BLOCK); - simpleItemBlock(PACKAGING_TABLE_BLOCK); + simpleItemBlock(PLOTTING_TABLE_BLOCK.get()); + simpleItemBlock(LITHOGRAPHY_TABLE_BLOCK.get()); + simpleItemBlock(PACKAGING_TABLE_BLOCK.get()); generated(IC_BLUEPRINT_ITEM); generated(BLANK_PHOTOMASK_ITEM); diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationLanguageProvider.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationLanguageProvider.java index c7137f1e3..cd950568a 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationLanguageProvider.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationLanguageProvider.java @@ -4,7 +4,9 @@ import net.minecraftforge.common.data.LanguageProvider; import static mrtjp.projectred.fabrication.ProjectRedFabrication.MOD_ID; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; +import static mrtjp.projectred.fabrication.init.FabricationItems.*; +import static mrtjp.projectred.fabrication.init.FabricationParts.FABRICATED_GATE_ITEM; import static mrtjp.projectred.fabrication.init.FabricationUnlocal.*; public class FabricationLanguageProvider extends LanguageProvider { @@ -24,20 +26,20 @@ protected void addTranslations() { // Creative tab add("itemGroup." + MOD_ID, "Project Red: Fabrication"); - add(IC_WORKBENCH_BLOCK, "IC Workbench"); - add(PLOTTING_TABLE_BLOCK, "Plotting Table"); - add(LITHOGRAPHY_TABLE_BLOCK, "Lithography Table"); - add(PACKAGING_TABLE_BLOCK, "Packaging Table"); + add(IC_WORKBENCH_BLOCK.get(), "IC Workbench"); + add(PLOTTING_TABLE_BLOCK.get(), "Plotting Table"); + add(LITHOGRAPHY_TABLE_BLOCK.get(), "Lithography Table"); + add(PACKAGING_TABLE_BLOCK.get(), "Packaging Table"); - add(IC_BLUEPRINT_ITEM, "IC Blueprint"); - add(BLANK_PHOTOMASK_ITEM, "Blank Photomask"); - add(PHOTOMASK_SET_ITEM, "Photomask Set"); - add(ROUGH_SILICON_WAFER_ITEM, "Rough Silicon Wafer"); - add(ETCHED_SILICON_WAFER_ITEM, "Etched Silicon Wafer"); - add(VALID_DIE_ITEM, "Valid Die"); - add(INVALID_DIE_ITEM, "Invalid Die"); + add(IC_BLUEPRINT_ITEM.get(), "IC Blueprint"); + add(BLANK_PHOTOMASK_ITEM.get(), "Blank Photomask"); + add(PHOTOMASK_SET_ITEM.get(), "Photomask Set"); + add(ROUGH_SILICON_WAFER_ITEM.get(), "Rough Silicon Wafer"); + add(ETCHED_SILICON_WAFER_ITEM.get(), "Etched Silicon Wafer"); + add(VALID_DIE_ITEM.get(), "Valid Die"); + add(INVALID_DIE_ITEM.get(), "Invalid Die"); - add(FABRICATED_GATE_ITEM, "Fabricated Gate"); + add(FABRICATED_GATE_ITEM.get(), "Fabricated Gate"); add(UL_TAB_INFO, "Info"); add(UL_TAB_EDIT, "Edit"); diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationRecipeProvider.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationRecipeProvider.java index 8575328ce..ab3c230d1 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationRecipeProvider.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/data/FabricationRecipeProvider.java @@ -7,11 +7,12 @@ import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import static mrtjp.projectred.core.init.CoreReferences.PLATE_ITEM; -import static mrtjp.projectred.core.init.CoreReferences.SILICON_ITEM; +import static mrtjp.projectred.core.init.CoreItems.PLATE_ITEM; +import static mrtjp.projectred.core.init.CoreItems.SILICON_ITEM; import static mrtjp.projectred.core.init.CoreTags.ELECTROTINE_ALLOY_INGOT_TAG; import static mrtjp.projectred.core.init.CoreTags.SAPPHIRE_GEM_TAG; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; +import static mrtjp.projectred.fabrication.init.FabricationItems.*; public class FabricationRecipeProvider extends RecipeProvider { @@ -27,26 +28,26 @@ public String getName() { @Override protected void registerRecipes() { - shapedRecipe(IC_WORKBENCH_BLOCK) + shapedRecipe(IC_WORKBENCH_BLOCK.get()) .key('s', Blocks.STONE) .key('w', ItemTags.PLANKS) - .key('b', IC_BLUEPRINT_ITEM) + .key('b', IC_BLUEPRINT_ITEM.get()) .patternLine("sss") .patternLine("wbw") .patternLine("www"); - shapedRecipe(PLOTTING_TABLE_BLOCK) + shapedRecipe(PLOTTING_TABLE_BLOCK.get()) .key('g', Blocks.GLASS) .key('t', SAPPHIRE_GEM_TAG) .key('s', Blocks.STONE) - .key('p', BLANK_PHOTOMASK_ITEM) + .key('p', BLANK_PHOTOMASK_ITEM.get()) .key('w', ItemTags.PLANKS) .key('b', ELECTROTINE_ALLOY_INGOT_TAG) .patternLine("gtg") .patternLine("sps") .patternLine("wbw"); - shapedRecipe(LITHOGRAPHY_TABLE_BLOCK) + shapedRecipe(LITHOGRAPHY_TABLE_BLOCK.get()) .key('g', Blocks.GLASS) .key('t', Tags.Items.GEMS_EMERALD) .key('o', Tags.Items.OBSIDIAN) @@ -57,17 +58,17 @@ protected void registerRecipes() { .patternLine("oio") .patternLine("wbw"); - shapedRecipe(PACKAGING_TABLE_BLOCK) + shapedRecipe(PACKAGING_TABLE_BLOCK.get()) .key('g', Blocks.GLASS) .key('t', Tags.Items.DUSTS_REDSTONE) - .key('p', PLATE_ITEM) + .key('p', PLATE_ITEM.get()) .key('w', ItemTags.PLANKS) .key('b', ELECTROTINE_ALLOY_INGOT_TAG) .patternLine("gtg") .patternLine("ppp") .patternLine("wbw"); - shapedRecipe(IC_BLUEPRINT_ITEM) + shapedRecipe(IC_BLUEPRINT_ITEM.get()) .key('p', Items.PAPER) .key('b', Tags.Items.DYES_BLUE) .key('r', Tags.Items.DUSTS_REDSTONE) @@ -75,14 +76,14 @@ protected void registerRecipes() { .patternLine("brb") .patternLine("pbp"); - shapedRecipe(BLANK_PHOTOMASK_ITEM) + shapedRecipe(BLANK_PHOTOMASK_ITEM.get()) .key('g', Tags.Items.GLASS_PANES) .key('q', Tags.Items.GEMS_QUARTZ) .patternLine("ggg") .patternLine("gqg") .patternLine("ggg"); - smelting(ROUGH_SILICON_WAFER_ITEM) - .ingredient(SILICON_ITEM); + smelting(ROUGH_SILICON_WAFER_ITEM.get()) + .ingredient(SILICON_ITEM.get()); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/IRotatableICTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/IRotatableICTile.java index 35a74aede..c3d97cc3c 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/IRotatableICTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/IRotatableICTile.java @@ -24,23 +24,23 @@ default int toAbsoluteMask(int intMask) { //@formatter:off static int rotationToDir(int r) { - switch (r) { - case 0: return 3; - case 1: return 4; - case 2: return 2; - case 3: return 5; - default: return -1; - } + return switch (r) { + case 0 -> 3; + case 1 -> 4; + case 2 -> 2; + case 3 -> 5; + default -> -1; + }; } static int dirToRotation(int dir) { - switch (dir) { - case 2: return 2; - case 3: return 0; - case 4: return 1; - case 5: return 3; - default: return -1; - } + return switch (dir) { + case 2 -> 2; + case 3 -> 0; + case 4 -> 1; + case 5 -> 3; + default -> -1; + }; } //@formatter:on diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/gates/IOGateTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/gates/IOGateTile.java index be297d867..dc73911dc 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/gates/IOGateTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/engine/gates/IOGateTile.java @@ -70,11 +70,8 @@ public void readDesc(MCDataInput in) { @Override public void read(MCDataInput in, int key) { switch (key) { - case COLOUR_PACKET: - colour = in.readByte(); - break; - default: - super.read(in, key); + case COLOUR_PACKET -> colour = in.readByte(); + default -> super.read(in, key); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/ICEditorToolTab.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/ICEditorToolTab.java index 0c9fec37d..f2a1aaf5b 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/ICEditorToolTab.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/ICEditorToolTab.java @@ -141,7 +141,7 @@ public void buildTooltip(List tooltip) { }; } - interface ButtonController { + protected interface ButtonController { void getTooltip(List tooltip); void onClick(); boolean isSelected(); diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/PipelineDiagramNode.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/PipelineDiagramNode.java index d7aa6c41e..92e3f80c9 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/PipelineDiagramNode.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/PipelineDiagramNode.java @@ -3,7 +3,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import mrtjp.projectred.fabrication.gui.screen.ICWorkbenchInfoTab; -import mrtjp.projectred.fabrication.init.FabricationReferences; import mrtjp.projectred.fabrication.lithography.LithographyPipeline; import mrtjp.projectred.fabrication.lithography.YieldCalculator; import mrtjp.projectred.lib.Point; @@ -14,6 +13,10 @@ import java.util.ArrayList; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; +import static mrtjp.projectred.fabrication.init.FabricationItems.*; +import static mrtjp.projectred.fabrication.init.FabricationParts.FABRICATED_GATE_ITEM; + @SuppressWarnings("NotNullFieldNotInitialized") public class PipelineDiagramNode extends AbstractGuiNode { @@ -60,15 +63,15 @@ private class BasicPipelineItems extends AbstractGuiNode { private final ArrayList items = new ArrayList<>(); public BasicPipelineItems() { - addItem(new ItemStack(FabricationReferences.IC_BLUEPRINT_ITEM), 30, 5); - addItem(new ItemStack(FabricationReferences.PLOTTING_TABLE_BLOCK), 64, 5); - addItem(new ItemStack(FabricationReferences.BLANK_PHOTOMASK_ITEM), 64, 39); - addItem(new ItemStack(FabricationReferences.PHOTOMASK_SET_ITEM), 98, 5); - addItem(new ItemStack(FabricationReferences.LITHOGRAPHY_TABLE_BLOCK), 132, 5); - addItem(new ItemStack(FabricationReferences.ROUGH_SILICON_WAFER_ITEM), 132, 39); - addItem(new ItemStack(FabricationReferences.VALID_DIE_ITEM), 166, 5); - addItem(new ItemStack(FabricationReferences.PACKAGING_TABLE_BLOCK), 200, 5); - addItem(new ItemStack(FabricationReferences.FABRICATED_GATE_ITEM), 234, 5); + addItem(new ItemStack(IC_BLUEPRINT_ITEM.get()), 30, 5); + addItem(new ItemStack(PLOTTING_TABLE_BLOCK.get()), 64, 5); + addItem(new ItemStack(BLANK_PHOTOMASK_ITEM.get()), 64, 39); + addItem(new ItemStack(PHOTOMASK_SET_ITEM.get()), 98, 5); + addItem(new ItemStack(LITHOGRAPHY_TABLE_BLOCK.get()), 132, 5); + addItem(new ItemStack(ROUGH_SILICON_WAFER_ITEM.get()), 132, 39); + addItem(new ItemStack(VALID_DIE_ITEM.get()), 166, 5); + addItem(new ItemStack(PACKAGING_TABLE_BLOCK.get()), 200, 5); + addItem(new ItemStack(FABRICATED_GATE_ITEM.get()), 234, 5); } private void addItem(ItemStack stack, int x, int y) { @@ -92,7 +95,7 @@ public void update() { ItemStackNode node = items.get(5); //Wafer slot switch (yieldCalculator.getWaferType()) { case ROUGH_WAFER: - node.setItemStack(new ItemStack(FabricationReferences.ROUGH_SILICON_WAFER_ITEM)); + node.setItemStack(new ItemStack(ROUGH_SILICON_WAFER_ITEM.get())); break; case POLISHED_WAFER: case PURIFIED_WAFER: diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/TabButtonNode.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/TabButtonNode.java index 1812ecee2..007ea8f8f 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/TabButtonNode.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/TabButtonNode.java @@ -128,7 +128,7 @@ public void onTabStateChanged(TabState prevState, TabState newState) { public abstract void buildTooltip(List tooltip); - enum TabState { + public enum TabState { ALL_CLOSED, // Unselected with no extension CLOSED, // Unselected with extension MINIMIZED, // Selected with no extension diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/VerticalListNode.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/VerticalListNode.java index 3ee60a5e0..20d49d3d5 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/VerticalListNode.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/VerticalListNode.java @@ -192,29 +192,19 @@ private Rect getPaddedFrame() { } private int getXForAlignment(Font fontRenderer, Component text) { - switch (horizontalAlignment) { - case LEFT: - return getPaddedFrame().x(); - case CENTER: - return getPaddedFrame().midX() - fontRenderer.width(text) / 2; - case RIGHT: - return getPaddedFrame().maxX() - fontRenderer.width(text); - default: - return getPaddedFrame().x(); - } + return switch (horizontalAlignment) { + case LEFT -> getPaddedFrame().x(); + case CENTER -> getPaddedFrame().midX() - fontRenderer.width(text) / 2; + case RIGHT -> getPaddedFrame().maxX() - fontRenderer.width(text); + }; } private int getYForAlignment(Font fontRenderer) { - switch (verticalAlignment) { - case TOP: - return getPaddedFrame().y(); - case CENTER: - return getPaddedFrame().midY() - fontRenderer.lineHeight / 2; - case BOTTOM: - return getPaddedFrame().maxY() - fontRenderer.lineHeight; - default: - return getPaddedFrame().y(); - } + return switch (verticalAlignment) { + case TOP -> getPaddedFrame().y(); + case CENTER -> getPaddedFrame().midY() - fontRenderer.lineHeight / 2; + case BOTTOM -> getPaddedFrame().maxY() - fontRenderer.lineHeight; + }; } public enum HorizontalAlignment { diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/screen/ICWorkbenchScreen.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/screen/ICWorkbenchScreen.java index e6722dc7d..f09d00bef 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/screen/ICWorkbenchScreen.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/gui/screen/ICWorkbenchScreen.java @@ -9,7 +9,6 @@ import mrtjp.projectred.fabrication.gui.SimpleUVTab; import mrtjp.projectred.fabrication.gui.TabButtonNode; import mrtjp.projectred.fabrication.gui.TabControllerNode; -import mrtjp.projectred.fabrication.init.FabricationReferences; import mrtjp.projectred.fabrication.tile.ICWorkbenchTile; import mrtjp.projectred.lib.Point; import mrtjp.projectred.redui.AbstractGuiNode; @@ -30,6 +29,8 @@ import static mrtjp.projectred.fabrication.editor.ICWorkbenchEditor.UNIFORM_GRAY; import static mrtjp.projectred.fabrication.editor.ICWorkbenchEditor.UNIFORM_RED; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.IC_WORKBENCH_BLOCK; +import static mrtjp.projectred.fabrication.init.FabricationItems.IC_BLUEPRINT_ITEM; import static mrtjp.projectred.fabrication.init.FabricationUnlocal.*; public class ICWorkbenchScreen extends RedUIScreen { @@ -148,11 +149,11 @@ public InactiveOverlayNode() { } private void initSubNodes() { - ItemStackNode blueprintNode = new ItemStackNode(new ItemStack(FabricationReferences.IC_BLUEPRINT_ITEM)); + ItemStackNode blueprintNode = new ItemStackNode(new ItemStack(IC_BLUEPRINT_ITEM.get())); blueprintNode.setPosition(58, 24); addChild(blueprintNode); - ItemStackNode workbenchNode = new ItemStackNode(new ItemStack(FabricationReferences.IC_WORKBENCH_BLOCK)); + ItemStackNode workbenchNode = new ItemStackNode(new ItemStack(IC_WORKBENCH_BLOCK.get())); workbenchNode.setPosition(58, 64); addChild(workbenchNode); } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationBlocks.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationBlocks.java index e83b2303c..2bf3d95ad 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationBlocks.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationBlocks.java @@ -11,11 +11,11 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.fabrication.ProjectRedFabrication.*; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; -@SuppressWarnings("DataFlowIssue") +@SuppressWarnings({ "DataFlowIssue", "NotNullFieldNotInitialized" }) public class FabricationBlocks { public static final String ID_IC_WORKBENCH = "ic_workbench"; @@ -23,24 +23,37 @@ public class FabricationBlocks { public static final String ID_LITHOGRAPHY_TABLE = "lithography_table"; public static final String ID_PACKAGING_TABLE = "packaging_table"; + // Blocks + public static RegistryObject IC_WORKBENCH_BLOCK; + public static RegistryObject PLOTTING_TABLE_BLOCK; + public static RegistryObject LITHOGRAPHY_TABLE_BLOCK; + public static RegistryObject PACKAGING_TABLE_BLOCK; + + // Block Entities + public static RegistryObject> IC_WORKBENCH_TILE; + public static RegistryObject> PLOTTING_TABLE_TILE; + public static RegistryObject> LITHOGRAPHY_TABLE_TILE; + public static RegistryObject> PACKAGING_TABLE_TILE; + + public static void register() { // Blocks - BLOCKS.register(ID_IC_WORKBENCH, ICWorkbenchBlock::new); - BLOCKS.register(ID_PLOTTING_TABLE, PlottingTableBlock::new); - BLOCKS.register(ID_LITHOGRAPHY_TABLE, LithographyTableBlock::new); - BLOCKS.register(ID_PACKAGING_TABLE, PackagingTableBlock::new); + IC_WORKBENCH_BLOCK = BLOCKS.register(ID_IC_WORKBENCH, ICWorkbenchBlock::new); + PLOTTING_TABLE_BLOCK = BLOCKS.register(ID_PLOTTING_TABLE, PlottingTableBlock::new); + LITHOGRAPHY_TABLE_BLOCK = BLOCKS.register(ID_LITHOGRAPHY_TABLE, LithographyTableBlock::new); + PACKAGING_TABLE_BLOCK = BLOCKS.register(ID_PACKAGING_TABLE, PackagingTableBlock::new); // Block Items - ITEMS.register(ID_IC_WORKBENCH, () -> new BlockItem(IC_WORKBENCH_BLOCK, new Item.Properties().tab(FABRICATION_GROUP))); - ITEMS.register(ID_PLOTTING_TABLE, () -> new BlockItem(PLOTTING_TABLE_BLOCK, new Item.Properties().tab(FABRICATION_GROUP))); - ITEMS.register(ID_LITHOGRAPHY_TABLE, () -> new BlockItem(LITHOGRAPHY_TABLE_BLOCK, new Item.Properties().tab(FABRICATION_GROUP))); - ITEMS.register(ID_PACKAGING_TABLE, () -> new BlockItem(PACKAGING_TABLE_BLOCK, new Item.Properties().tab(FABRICATION_GROUP))); + ITEMS.register(ID_IC_WORKBENCH, () -> new BlockItem(IC_WORKBENCH_BLOCK.get(), new Item.Properties().tab(FABRICATION_GROUP))); + ITEMS.register(ID_PLOTTING_TABLE, () -> new BlockItem(PLOTTING_TABLE_BLOCK.get(), new Item.Properties().tab(FABRICATION_GROUP))); + ITEMS.register(ID_LITHOGRAPHY_TABLE, () -> new BlockItem(LITHOGRAPHY_TABLE_BLOCK.get(), new Item.Properties().tab(FABRICATION_GROUP))); + ITEMS.register(ID_PACKAGING_TABLE, () -> new BlockItem(PACKAGING_TABLE_BLOCK.get(), new Item.Properties().tab(FABRICATION_GROUP))); // Tiles - TILE_ENTITIES.register(ID_IC_WORKBENCH, () -> BlockEntityType.Builder.of(ICWorkbenchTile::new, IC_WORKBENCH_BLOCK).build(null)); - TILE_ENTITIES.register(ID_PLOTTING_TABLE, () -> BlockEntityType.Builder.of(PlottingTableTile::new, PLOTTING_TABLE_BLOCK).build(null)); - TILE_ENTITIES.register(ID_LITHOGRAPHY_TABLE, () -> BlockEntityType.Builder.of(LithographyTableTile::new, LITHOGRAPHY_TABLE_BLOCK).build(null)); - TILE_ENTITIES.register(ID_PACKAGING_TABLE, () -> BlockEntityType.Builder.of(PackagingTableTile::new, PACKAGING_TABLE_BLOCK).build(null)); + IC_WORKBENCH_TILE = BLOCK_ENTITY_TYPES.register(ID_IC_WORKBENCH, () -> BlockEntityType.Builder.of(ICWorkbenchTile::new, IC_WORKBENCH_BLOCK.get()).build(null)); + PLOTTING_TABLE_TILE = BLOCK_ENTITY_TYPES.register(ID_PLOTTING_TABLE, () -> BlockEntityType.Builder.of(PlottingTableTile::new, PLOTTING_TABLE_BLOCK.get()).build(null)); + LITHOGRAPHY_TABLE_TILE = BLOCK_ENTITY_TYPES.register(ID_LITHOGRAPHY_TABLE, () -> BlockEntityType.Builder.of(LithographyTableTile::new, LITHOGRAPHY_TABLE_BLOCK.get()).build(null)); + PACKAGING_TABLE_TILE = BLOCK_ENTITY_TYPES.register(ID_PACKAGING_TABLE, () -> BlockEntityType.Builder.of(PackagingTableTile::new, PACKAGING_TABLE_BLOCK.get()).build(null)); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java index dfdf4f244..562cdb15e 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationClientInit.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import static mrtjp.projectred.fabrication.init.FabricationReferences.*; +import static mrtjp.projectred.fabrication.init.FabricationMenus.*; @SuppressWarnings("DataFlowIssue") public class FabricationClientInit { @@ -32,11 +32,11 @@ private static void clientSetup(final FMLClientSetupEvent event) { // Register models ModelRegistryHelper modelRegistryHelper = new ModelRegistryHelper(); - modelRegistryHelper.register(new ModelResourceLocation(FabricationReferences.FABRICATED_GATE_ITEM.getRegistryName(), "inventory"), GatePartItemRenderer.INSTANCE); + modelRegistryHelper.register(new ModelResourceLocation(FabricationParts.FABRICATED_GATE_ITEM.get().getRegistryName(), "inventory"), GatePartItemRenderer.INSTANCE); // Register screens - MenuScreens.register(PLOTTING_TABLE_CONTAINER, PlottingTableScreen::new); - MenuScreens.register(LITHOGRAPHY_TABLE_CONTAINER, LithographyTableScreen::new); - MenuScreens.register(PACKAGING_TABLE_CONTAINER, PackagingTableScreen::new); + MenuScreens.register(PLOTTING_TABLE_CONTAINER.get(), PlottingTableScreen::new); + MenuScreens.register(LITHOGRAPHY_TABLE_CONTAINER.get(), LithographyTableScreen::new); + MenuScreens.register(PACKAGING_TABLE_CONTAINER.get(), PackagingTableScreen::new); } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationContainers.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationContainers.java deleted file mode 100644 index 9a7f1f0d9..000000000 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationContainers.java +++ /dev/null @@ -1,19 +0,0 @@ -package mrtjp.projectred.fabrication.init; - -import codechicken.lib.inventory.container.ICCLContainerType; -import mrtjp.projectred.fabrication.inventory.container.LithographyTableContainer; -import mrtjp.projectred.fabrication.inventory.container.PackagingTableContainer; -import mrtjp.projectred.fabrication.inventory.container.PlottingTableContainer; - -import static mrtjp.projectred.fabrication.ProjectRedFabrication.CONTAINERS; -import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; - -public class FabricationContainers { - - public static void register() { - - CONTAINERS.register(ID_PLOTTING_TABLE, () -> ICCLContainerType.create(PlottingTableContainer.FACTORY)); - CONTAINERS.register(ID_LITHOGRAPHY_TABLE, () -> ICCLContainerType.create(LithographyTableContainer.FACTORY)); - CONTAINERS.register(ID_PACKAGING_TABLE, () -> ICCLContainerType.create(PackagingTableContainer.FACTORY)); - } -} diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationItems.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationItems.java index b7846b863..ec0eb3563 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationItems.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationItems.java @@ -1,9 +1,11 @@ package mrtjp.projectred.fabrication.init; import mrtjp.projectred.fabrication.item.*; +import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.fabrication.ProjectRedFabrication.ITEMS; +@SuppressWarnings("NotNullFieldNotInitialized") public class FabricationItems { public static final String ID_IC_BLUEPRINT = "ic_blueprint"; @@ -14,15 +16,23 @@ public class FabricationItems { public static final String ID_VALID_DIE = "valid_die"; public static final String ID_INVALID_DIE = "invalid_die"; + public static RegistryObject IC_BLUEPRINT_ITEM; + public static RegistryObject BLANK_PHOTOMASK_ITEM; + public static RegistryObject PHOTOMASK_SET_ITEM; + public static RegistryObject ROUGH_SILICON_WAFER_ITEM; + public static RegistryObject ETCHED_SILICON_WAFER_ITEM; + public static RegistryObject VALID_DIE_ITEM; + public static RegistryObject INVALID_DIE_ITEM; + public static void register() { // Items - ITEMS.register(ID_IC_BLUEPRINT, ICBlueprintItem::new); - ITEMS.register(ID_BLANK_PHOTOMASK, BlankPhotomaskItem::new); - ITEMS.register(ID_PHOTOMASK_SET, PhotomaskSetItem::new); - ITEMS.register(ID_ROUGH_SILICON_WAFER, RoughSiliconWaferItem::new); - ITEMS.register(ID_ETCHED_SILICON_WAFER, EtchedSiliconWaferItem::new); - ITEMS.register(ID_VALID_DIE, ValidDieItem::new); - ITEMS.register(ID_INVALID_DIE, InvalidDieItem::new); + IC_BLUEPRINT_ITEM = ITEMS.register(ID_IC_BLUEPRINT, ICBlueprintItem::new); + BLANK_PHOTOMASK_ITEM = ITEMS.register(ID_BLANK_PHOTOMASK, BlankPhotomaskItem::new); + PHOTOMASK_SET_ITEM = ITEMS.register(ID_PHOTOMASK_SET, PhotomaskSetItem::new); + ROUGH_SILICON_WAFER_ITEM = ITEMS.register(ID_ROUGH_SILICON_WAFER, RoughSiliconWaferItem::new); + ETCHED_SILICON_WAFER_ITEM = ITEMS.register(ID_ETCHED_SILICON_WAFER, EtchedSiliconWaferItem::new); + VALID_DIE_ITEM = ITEMS.register(ID_VALID_DIE, ValidDieItem::new); + INVALID_DIE_ITEM = ITEMS.register(ID_INVALID_DIE, InvalidDieItem::new); } } \ No newline at end of file diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationMenus.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationMenus.java new file mode 100644 index 000000000..674ea0c65 --- /dev/null +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationMenus.java @@ -0,0 +1,26 @@ +package mrtjp.projectred.fabrication.init; + +import codechicken.lib.inventory.container.ICCLContainerType; +import mrtjp.projectred.fabrication.inventory.container.LithographyTableContainer; +import mrtjp.projectred.fabrication.inventory.container.PackagingTableContainer; +import mrtjp.projectred.fabrication.inventory.container.PlottingTableContainer; +import net.minecraft.world.inventory.MenuType; +import net.minecraftforge.registries.RegistryObject; + +import static mrtjp.projectred.fabrication.ProjectRedFabrication.MENU_TYPES; +import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; + +@SuppressWarnings("NotNullFieldNotInitialized") +public class FabricationMenus { + + public static RegistryObject> PLOTTING_TABLE_CONTAINER; + public static RegistryObject> LITHOGRAPHY_TABLE_CONTAINER; + public static RegistryObject> PACKAGING_TABLE_CONTAINER; + + public static void register() { + + PLOTTING_TABLE_CONTAINER = MENU_TYPES.register(ID_PLOTTING_TABLE, () -> ICCLContainerType.create(PlottingTableContainer.FACTORY)); + LITHOGRAPHY_TABLE_CONTAINER = MENU_TYPES.register(ID_LITHOGRAPHY_TABLE, () -> ICCLContainerType.create(LithographyTableContainer.FACTORY)); + PACKAGING_TABLE_CONTAINER = MENU_TYPES.register(ID_PACKAGING_TABLE, () -> ICCLContainerType.create(PackagingTableContainer.FACTORY)); + } +} diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationParts.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationParts.java index 5e93d0579..e05e3d529 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationParts.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationParts.java @@ -5,26 +5,30 @@ import mrtjp.projectred.fabrication.item.FabricatedGatePartItem; import mrtjp.projectred.fabrication.part.FabricatedGatePart; import mrtjp.projectred.integration.GateType; +import mrtjp.projectred.integration.item.GatePartItem; import mrtjp.projectred.integration.part.GatePart; -import net.minecraft.world.item.Item; import net.minecraftforge.registries.RegistryObject; import static mrtjp.projectred.fabrication.ProjectRedFabrication.ITEMS; import static mrtjp.projectred.fabrication.ProjectRedFabrication.PARTS; +@SuppressWarnings("NotNullFieldNotInitialized") public class FabricationParts { - public static final String ID_FABRICATED_GATE = "fabricated_gate"; + public static final String ID_FABRICATED_GATE = "fabricated_gate"; - public static void register() { + public static RegistryObject FABRICATED_GATE_ITEM; + public static RegistryObject> FABRICATED_GATE_PART; - // Items - RegistryObject registeredItem = ITEMS.register(ID_FABRICATED_GATE, () -> new FabricatedGatePartItem(GateType.FABRICATED_GATE)); + public static void register() { - // Parts - RegistryObject> registeredPartType = PARTS.register(ID_FABRICATED_GATE, () -> new SimpleMultipartType<>(b -> new FabricatedGatePart())); + // Items + FABRICATED_GATE_ITEM = ITEMS.register(ID_FABRICATED_GATE, () -> new FabricatedGatePartItem(GateType.FABRICATED_GATE)); - // Add to GateType enum - GateType.FABRICATED_GATE.inject(ID_FABRICATED_GATE, isClient -> new FabricatedGatePart(), registeredItem, registeredPartType); - } + // Parts + FABRICATED_GATE_PART = PARTS.register(ID_FABRICATED_GATE, () -> new SimpleMultipartType<>(b -> new FabricatedGatePart())); + + // Add to GateType enum + GateType.FABRICATED_GATE.inject(ID_FABRICATED_GATE, isClient -> new FabricatedGatePart(), FABRICATED_GATE_ITEM, FABRICATED_GATE_PART); + } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationReferences.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationReferences.java deleted file mode 100644 index 6920bab52..000000000 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/init/FabricationReferences.java +++ /dev/null @@ -1,79 +0,0 @@ -package mrtjp.projectred.fabrication.init; - -import codechicken.multipart.api.MultipartType; -import mrtjp.projectred.fabrication.block.ICWorkbenchBlock; -import mrtjp.projectred.fabrication.block.LithographyTableBlock; -import mrtjp.projectred.fabrication.block.PackagingTableBlock; -import mrtjp.projectred.fabrication.block.PlottingTableBlock; -import mrtjp.projectred.fabrication.inventory.container.LithographyTableContainer; -import mrtjp.projectred.fabrication.inventory.container.PackagingTableContainer; -import mrtjp.projectred.fabrication.inventory.container.PlottingTableContainer; -import mrtjp.projectred.fabrication.item.*; -import mrtjp.projectred.fabrication.tile.ICWorkbenchTile; -import mrtjp.projectred.fabrication.tile.LithographyTableTile; -import mrtjp.projectred.fabrication.tile.PackagingTableTile; -import mrtjp.projectred.fabrication.tile.PlottingTableTile; -import mrtjp.projectred.integration.item.GatePartItem; -import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.registries.ObjectHolder; - -import static mrtjp.projectred.fabrication.ProjectRedFabrication.MOD_ID; -import static mrtjp.projectred.fabrication.init.FabricationBlocks.*; -import static mrtjp.projectred.fabrication.init.FabricationItems.*; -import static mrtjp.projectred.fabrication.init.FabricationParts.ID_FABRICATED_GATE; - -@ObjectHolder(MOD_ID) -@SuppressWarnings("NotNullFieldNotInitialized") -public class FabricationReferences { - - // Blocks - @ObjectHolder(ID_IC_WORKBENCH) - public static ICWorkbenchBlock IC_WORKBENCH_BLOCK; - @ObjectHolder(ID_PLOTTING_TABLE) - public static PlottingTableBlock PLOTTING_TABLE_BLOCK; - @ObjectHolder(ID_LITHOGRAPHY_TABLE) - public static LithographyTableBlock LITHOGRAPHY_TABLE_BLOCK; - @ObjectHolder(ID_PACKAGING_TABLE) - public static PackagingTableBlock PACKAGING_TABLE_BLOCK; - - // Tiles - @ObjectHolder(ID_IC_WORKBENCH) - public static BlockEntityType IC_WORKBENCH_TILE; - @ObjectHolder(ID_PLOTTING_TABLE) - public static BlockEntityType PLOTTING_TABLE_TILE; - @ObjectHolder(ID_LITHOGRAPHY_TABLE) - public static BlockEntityType LITHOGRAPHY_TABLE_TILE; - @ObjectHolder(ID_PACKAGING_TABLE) - public static BlockEntityType PACKAGING_TABLE_TILE; - - // Containers - @ObjectHolder(ID_PLOTTING_TABLE) - public static MenuType PLOTTING_TABLE_CONTAINER; - @ObjectHolder(ID_LITHOGRAPHY_TABLE) - public static MenuType LITHOGRAPHY_TABLE_CONTAINER; - @ObjectHolder(ID_PACKAGING_TABLE) - public static MenuType PACKAGING_TABLE_CONTAINER; - - // Items - @ObjectHolder(ID_IC_BLUEPRINT) - public static ICBlueprintItem IC_BLUEPRINT_ITEM; - @ObjectHolder(ID_BLANK_PHOTOMASK) - public static BlankPhotomaskItem BLANK_PHOTOMASK_ITEM; - @ObjectHolder(ID_PHOTOMASK_SET) - public static PhotomaskSetItem PHOTOMASK_SET_ITEM; - @ObjectHolder(ID_ROUGH_SILICON_WAFER) - public static RoughSiliconWaferItem ROUGH_SILICON_WAFER_ITEM; - @ObjectHolder(ID_ETCHED_SILICON_WAFER) - public static EtchedSiliconWaferItem ETCHED_SILICON_WAFER_ITEM; - @ObjectHolder(ID_VALID_DIE) - public static ValidDieItem VALID_DIE_ITEM; - @ObjectHolder(ID_INVALID_DIE) - public static InvalidDieItem INVALID_DIE_ITEM; - - // Parts - @ObjectHolder(ID_FABRICATED_GATE) - public static GatePartItem FABRICATED_GATE_ITEM; - @ObjectHolder(ID_FABRICATED_GATE) - public static MultipartType FABRICATED_GATE_PART; -} diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/LithographyTableContainer.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/LithographyTableContainer.java index 9b7db2d7a..8958e0665 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/LithographyTableContainer.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/LithographyTableContainer.java @@ -2,7 +2,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.TakeOnlySlot; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationMenus; import mrtjp.projectred.fabrication.item.PhotomaskSetItem; import mrtjp.projectred.fabrication.item.RoughSiliconWaferItem; import mrtjp.projectred.fabrication.tile.LithographyTableTile; @@ -26,7 +26,7 @@ public class LithographyTableContainer extends FabricationMachineContainer { private final LithographyTableTile tile; public LithographyTableContainer(Inventory playerInventory, LithographyTableTile tile, int windowId) { - super(FabricationReferences.LITHOGRAPHY_TABLE_CONTAINER, windowId, tile); + super(FabricationMenus.LITHOGRAPHY_TABLE_CONTAINER.get(), windowId, tile); this.playerInventory = playerInventory; this.tile = tile; diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PackagingTableContainer.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PackagingTableContainer.java index ed171b593..c8be06edb 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PackagingTableContainer.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PackagingTableContainer.java @@ -3,7 +3,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.SimpleDataSlot; import mrtjp.projectred.core.inventory.container.TakeOnlySlot; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationMenus; import mrtjp.projectred.fabrication.item.ValidDieItem; import mrtjp.projectred.fabrication.tile.PackagingTableTile; import mrtjp.projectred.lib.InventoryLib; @@ -28,7 +28,7 @@ public class PackagingTableContainer extends FabricationMachineContainer { protected int problematicSlotMask; public PackagingTableContainer(Inventory playerInventory, PackagingTableTile tile, int windowId) { - super(FabricationReferences.PACKAGING_TABLE_CONTAINER, windowId, tile); + super(FabricationMenus.PACKAGING_TABLE_CONTAINER.get(), windowId, tile); this.playerInventory = playerInventory; this.tile = tile; diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PlottingTableContainer.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PlottingTableContainer.java index 3b008d6db..575d1b3bf 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PlottingTableContainer.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/inventory/container/PlottingTableContainer.java @@ -2,7 +2,7 @@ import codechicken.lib.inventory.container.ICCLContainerFactory; import mrtjp.projectred.core.inventory.container.TakeOnlySlot; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationMenus; import mrtjp.projectred.fabrication.item.BlankPhotomaskItem; import mrtjp.projectred.fabrication.item.ICBlueprintItem; import mrtjp.projectred.fabrication.tile.PlottingTableTile; @@ -26,7 +26,7 @@ public class PlottingTableContainer extends FabricationMachineContainer { private final PlottingTableTile tile; public PlottingTableContainer(Inventory playerInventory, PlottingTableTile tile, int windowId) { - super(FabricationReferences.PLOTTING_TABLE_CONTAINER, windowId, tile); + super(FabricationMenus.PLOTTING_TABLE_CONTAINER.get(), windowId, tile); this.playerInventory = playerInventory; this.tile = tile; diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/EtchedSiliconWaferItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/EtchedSiliconWaferItem.java index c02494de2..2051b79ea 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/EtchedSiliconWaferItem.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/EtchedSiliconWaferItem.java @@ -1,7 +1,7 @@ package mrtjp.projectred.fabrication.item; import mrtjp.projectred.fabrication.ProjectRedFabrication; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationItems; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -80,7 +80,7 @@ public static ItemStack createFromPhotomaskSet(ItemStack photomaskSet, int wafer tag.putByteArray("defects", defects); // Put NBT on new item stack and return - ItemStack output = new ItemStack(FabricationReferences.ETCHED_SILICON_WAFER_ITEM); + ItemStack output = new ItemStack(FabricationItems.ETCHED_SILICON_WAFER_ITEM.get()); output.setTag(tag); return output; } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java index 66771ae11..7914bfeb1 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/ICBlueprintItem.java @@ -2,7 +2,8 @@ import mrtjp.projectred.fabrication.ProjectRedFabrication; import mrtjp.projectred.fabrication.engine.InterfaceSpec; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; +import mrtjp.projectred.fabrication.init.FabricationItems; import mrtjp.projectred.integration.GateType; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; @@ -45,7 +46,7 @@ public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) { // Creative mode bypass: Convert blueprint directly to gate block BlockState blockState = context.getLevel().getBlockState(context.getClickedPos()); - if (blockState.getBlock() == FabricationReferences.IC_WORKBENCH_BLOCK) { return InteractionResult.PASS; } + if (blockState.getBlock() == FabricationBlocks.IC_WORKBENCH_BLOCK.get()) { return InteractionResult.PASS; } if (!canFabricate(stack.getTag())) { return InteractionResult.PASS; @@ -107,7 +108,7 @@ private static TranslatableComponent getBundledIOTextComponent(byte bmask, int r public static ItemStack createPhotomaskStack(ItemStack blueprintStack) { - ItemStack photomaskStack = new ItemStack(FabricationReferences.PHOTOMASK_SET_ITEM); + ItemStack photomaskStack = new ItemStack(FabricationItems.PHOTOMASK_SET_ITEM.get()); CompoundTag blueprintTag = blueprintStack.getTag(); if (!hasFabricationTarget(blueprintTag)) return photomaskStack; diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java index 392b57aa6..931fc1460 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/item/PhotomaskSetItem.java @@ -1,7 +1,7 @@ package mrtjp.projectred.fabrication.item; import mrtjp.projectred.fabrication.ProjectRedFabrication; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationItems; import mrtjp.projectred.integration.GateType; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; @@ -43,7 +43,7 @@ public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) { } public static ItemStack createDieStack(ItemStack photomask, int count) { - ItemStack validDieStack = new ItemStack(FabricationReferences.VALID_DIE_ITEM, count); + ItemStack validDieStack = new ItemStack(FabricationItems.VALID_DIE_ITEM.get(), count); validDieStack.setTag(Objects.requireNonNull(photomask.getTag()).copy()); //Nothing additional to add yet return validDieStack; } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/ICWorkbenchTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/ICWorkbenchTile.java index 81aa67aac..96ccd3878 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/ICWorkbenchTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/ICWorkbenchTile.java @@ -11,7 +11,7 @@ import mrtjp.projectred.fabrication.editor.ICWorkbenchEditor; import mrtjp.projectred.fabrication.editor.IICWorkbenchEditorNetwork; import mrtjp.projectred.fabrication.gui.screen.ICWorkbenchScreen; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; @@ -30,6 +30,7 @@ import java.util.stream.Collectors; import static mrtjp.projectred.fabrication.ProjectRedFabrication.LOGGER; +import static mrtjp.projectred.fabrication.init.FabricationItems.IC_BLUEPRINT_ITEM; public class ICWorkbenchTile extends ProjectRedTile implements IPacketReceiverTile, IICWorkbenchEditorNetwork { @@ -44,7 +45,7 @@ public class ICWorkbenchTile extends ProjectRedTile implements IPacketReceiverTi private final Set playersWatchingScreen = new HashSet<>(); public ICWorkbenchTile(BlockPos pos, BlockState state) { - super(FabricationReferences.IC_WORKBENCH_TILE, pos, state); + super(FabricationBlocks.IC_WORKBENCH_TILE.get(), pos, state); } public ICWorkbenchEditor getEditor() { @@ -95,7 +96,7 @@ public InteractionResult onBlockActivated(Player player, InteractionHand hand, B ItemStack stackInHand = player.getItemInHand(hand); boolean blueprintOnTable = getBlockState().getValue(ICWorkbenchBlock.BLUEPRINT_PROPERTY); - boolean blueprintInHand = !stackInHand.isEmpty() && stackInHand.getItem() == FabricationReferences.IC_BLUEPRINT_ITEM; + boolean blueprintInHand = !stackInHand.isEmpty() && stackInHand.getItem() == IC_BLUEPRINT_ITEM.get(); if (!blueprintOnTable && blueprintInHand) { // load blueprint and activate editor @@ -129,7 +130,7 @@ public void onBlockRemoved() { } private ItemStack createBlueprintStack() { - ItemStack stack = new ItemStack(FabricationReferences.IC_BLUEPRINT_ITEM); + ItemStack stack = new ItemStack(IC_BLUEPRINT_ITEM.get()); editor.writeBlueprintTagAndDeactivate(stack.getOrCreateTag()); return stack; } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/LithographyTableTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/LithographyTableTile.java index 326b22ee0..21db539d0 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/LithographyTableTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/LithographyTableTile.java @@ -5,7 +5,8 @@ import codechicken.lib.util.ServerUtils; import codechicken.lib.vec.Vector3; import mrtjp.projectred.core.inventory.BaseInventory; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; +import mrtjp.projectred.fabrication.init.FabricationItems; import mrtjp.projectred.fabrication.inventory.container.LithographyTableContainer; import mrtjp.projectred.fabrication.item.BaseSiliconWaferItem; import mrtjp.projectred.fabrication.item.PhotomaskSetItem; @@ -36,14 +37,11 @@ public class LithographyTableTile extends FabricationMachineTile { @Override public boolean canPlaceItem(int slot, ItemStack stack) { - switch (slot) { - case 0: - return stack.getItem() instanceof PhotomaskSetItem; - case 1: - return stack.getItem() instanceof BaseSiliconWaferItem; - default: - return false; - } + return switch (slot) { + case 0 -> stack.getItem() instanceof PhotomaskSetItem; + case 1 -> stack.getItem() instanceof BaseSiliconWaferItem; + default -> false; + }; } @Override @@ -54,7 +52,7 @@ public void setChanged() { }; public LithographyTableTile(BlockPos pos, BlockState state) { - super(FabricationReferences.LITHOGRAPHY_TABLE_TILE, pos, state); + super(FabricationBlocks.LITHOGRAPHY_TABLE_TILE.get(), pos, state); inventory.addListener(c -> setChanged()); } @@ -161,7 +159,7 @@ protected void finishWork() { inventory.setItem(2, validDieStack); } if (totalDefectiveDies > 0) { - ItemStack defectiveDieStack = new ItemStack(FabricationReferences.INVALID_DIE_ITEM, totalDefectiveDies); + ItemStack defectiveDieStack = new ItemStack(FabricationItems.INVALID_DIE_ITEM.get(), totalDefectiveDies); inventory.setItem(3, defectiveDieStack); } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java index 55d33a75b..d3d3a8c52 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PackagingTableTile.java @@ -4,12 +4,12 @@ import codechicken.lib.data.MCDataOutput; import codechicken.lib.util.ServerUtils; import codechicken.lib.vec.Vector3; -import mrtjp.projectred.core.init.CoreReferences; +import mrtjp.projectred.core.init.CoreItems; import mrtjp.projectred.core.inventory.BaseInventory; import mrtjp.projectred.core.tile.IPacketReceiverTile; import mrtjp.projectred.fabrication.engine.ICInterfaceType; import mrtjp.projectred.fabrication.engine.InterfaceSpec; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.inventory.container.PackagingTableContainer; import mrtjp.projectred.fabrication.item.ValidDieItem; import net.minecraft.core.BlockPos; @@ -61,7 +61,7 @@ public void setChanged() { private int problematicSlotMask = 0; // Masks of slots that client should render red highlights public PackagingTableTile(BlockPos pos, BlockState state) { - super(FabricationReferences.PACKAGING_TABLE_TILE, pos, state); + super(FabricationBlocks.PACKAGING_TABLE_TILE.get(), pos, state); inventory.addListener(c -> setChanged()); } @@ -137,9 +137,9 @@ protected boolean canStartWork() { // Each type of IO corresponds to a particular ingredient boolean match = inventory.getItem(slotMap[r]).is(switch (type) { - case NC -> CoreReferences.PLATE_ITEM; - case REDSTONE -> CoreReferences.CONDUCTIVE_PLATE_ITEM; - case BUNDLED -> CoreReferences.BUNDLED_PLATE_ITEM; + case NC -> CoreItems.PLATE_ITEM.get(); + case REDSTONE -> CoreItems.CONDUCTIVE_PLATE_ITEM.get(); + case BUNDLED -> CoreItems.BUNDLED_PLATE_ITEM.get(); }); if (!match) { @@ -150,7 +150,7 @@ protected boolean canStartWork() { // Check corner slots int[] cornerSlots = { 0, 2, 6, 8 }; for (int slot : cornerSlots) { - if (!inventory.getItem(slot).is(CoreReferences.PLATE_ITEM)) { + if (!inventory.getItem(slot).is(CoreItems.PLATE_ITEM.get())) { problematicSlotMask |= 1 << slot; } } diff --git a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java index bd92cbc76..55dcde9ff 100644 --- a/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java +++ b/fabrication/src/main/java/mrtjp/projectred/fabrication/tile/PlottingTableTile.java @@ -6,7 +6,7 @@ import codechicken.lib.vec.Vector3; import mrtjp.projectred.core.inventory.BaseInventory; import mrtjp.projectred.fabrication.editor.EditorDataUtils; -import mrtjp.projectred.fabrication.init.FabricationReferences; +import mrtjp.projectred.fabrication.init.FabricationBlocks; import mrtjp.projectred.fabrication.inventory.container.PlottingTableContainer; import mrtjp.projectred.fabrication.item.BlankPhotomaskItem; import mrtjp.projectred.fabrication.item.ICBlueprintItem; @@ -35,14 +35,11 @@ public class PlottingTableTile extends FabricationMachineTile { @Override public boolean canPlaceItem(int slot, ItemStack stack) { - switch (slot) { - case 0: - return stack.getItem() instanceof ICBlueprintItem; - case 1: - return stack.getItem() instanceof BlankPhotomaskItem; - default: - return false; - } + return switch (slot) { + case 0 -> stack.getItem() instanceof ICBlueprintItem; + case 1 -> stack.getItem() instanceof BlankPhotomaskItem; + default -> false; + }; } @Override @@ -53,7 +50,7 @@ public void setChanged() { }; public PlottingTableTile(BlockPos pos, BlockState state) { - super(FabricationReferences.PLOTTING_TABLE_TILE, pos, state); + super(FabricationBlocks.PLOTTING_TABLE_TILE.get(), pos, state); inventory.addListener(c -> setChanged()); } diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/black_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/blue_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/brown_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/cyan_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/gray_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/green_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_blue_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/light_gray_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/lime_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/magenta_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/orange_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/pink_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/purple_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/red_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/white_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json index 1a32e534d..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_cage_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/cage_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json index 42a6d9db0..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fallout_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fallout_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json index 6e501ce31..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_fixture_light.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/fixture_light" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_inverted_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json index efa1788e6..1bcbb312f 100644 --- a/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json +++ b/illumination/src/main/generated/assets/projectred_illumination/models/item/yellow_lantern.json @@ -1,3 +1,3 @@ { - "parent": "projectred_illumination:item/lantern" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/BlockLightType.java b/illumination/src/main/java/mrtjp/projectred/illumination/BlockLightType.java index 43886273f..0a8740d85 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/BlockLightType.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/BlockLightType.java @@ -11,10 +11,10 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; import java.util.ArrayList; import java.util.function.BiFunction; -import java.util.function.Supplier; @SuppressWarnings("DataFlowIssue") public enum BlockLightType { @@ -25,12 +25,12 @@ public enum BlockLightType { private final BiFunction blockFactory; private final BlockLightBlockEntityFactory tileFactory; - private final ArrayList> blockSupplier = new ArrayList<>(); - private final ArrayList> invertedBlockSupplier = new ArrayList<>(); - private final ArrayList> itemBlockSupplier = new ArrayList<>(); - private final ArrayList> invertedItemBlockSupplier = new ArrayList<>(); - private final ArrayList>> tileEntityTypeSupplier = new ArrayList<>(); - private final ArrayList>> invertedTileEntityTypeSupplier = new ArrayList<>(); + private final ArrayList> blockSupplier = new ArrayList<>(); + private final ArrayList> invertedBlockSupplier = new ArrayList<>(); + private final ArrayList> itemBlockSupplier = new ArrayList<>(); + private final ArrayList> invertedItemBlockSupplier = new ArrayList<>(); + private final ArrayList>> tileEntityTypeSupplier = new ArrayList<>(); + private final ArrayList>> invertedTileEntityTypeSupplier = new ArrayList<>(); BlockLightType(String unlocalName, String localName, BiFunction blockFactory, BlockLightBlockEntityFactory tileFactory) { this.unlocalName = unlocalName; diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java index 79f06762f..78fe27ade 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightProperties.java @@ -105,9 +105,8 @@ public IItemRenderer getItemRenderer() { return new IItemRenderer() { @Override public void renderItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack mStack, MultiBufferSource getter, int packedLight, int packedOverlay) { - if (!(stack.getItem() instanceof MultipartLightPartItem)) return; + if (!(stack.getItem() instanceof MultipartLightPartItem lightItem)) return; - MultipartLightPartItem lightItem = (MultipartLightPartItem) stack.getItem(); CCRenderState ccrs = CCRenderState.instance(); ccrs.reset(); ccrs.brightness = packedLight; diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightType.java b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightType.java index 4e4c8b715..041292e45 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightType.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/MultipartLightType.java @@ -58,6 +58,10 @@ public void registerParts(DeferredRegister> partRegistry, Defer } } + public RegistryObject getItemRegistryObject(int color, boolean inverted) { + return inverted ? invertedItemSuppliers.get(color) : itemSuppliers.get(color); + } + public Item getItem(int color, boolean inverted) { return inverted ? invertedItemSuppliers.get(color).get() : itemSuppliers.get(color).get(); } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/ProjectRedIllumination.java b/illumination/src/main/java/mrtjp/projectred/illumination/ProjectRedIllumination.java index 5580d369d..e335808c9 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/ProjectRedIllumination.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/ProjectRedIllumination.java @@ -33,8 +33,8 @@ public class ProjectRedIllumination { public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> TILE_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); - public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); + public static final DeferredRegister> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID); + public static final DeferredRegister> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); public static final SimpleCreativeTab ILLUMINATION_GROUP = new SimpleCreativeTab(MOD_ID, () -> new ItemStack(BlockLightType.ILLUMAR_LAMP.getBlock(EnumColour.RED.ordinal(), true))); @@ -54,8 +54,8 @@ public ProjectRedIllumination() { BLOCKS.register(modEventBus); ITEMS.register(modEventBus); - TILE_ENTITIES.register(modEventBus); - PARTS.register(modEventBus); + BLOCK_ENTITY_TYPES.register(modEventBus); + PART_TYPES.register(modEventBus); modEventBus.register(new IlluminationMicroMaterials()); } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/client/IllumarLampItemRenderer.java b/illumination/src/main/java/mrtjp/projectred/illumination/client/IllumarLampItemRenderer.java index 927fbd975..240474c16 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/client/IllumarLampItemRenderer.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/client/IllumarLampItemRenderer.java @@ -37,12 +37,10 @@ public IllumarLampItemRenderer(BakedModel wrapped) { @Override public void renderItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack mStack, MultiBufferSource getter, int packedLight, int packedOverlay) { Item item = stack.getItem(); - if (!(item instanceof BlockItem)) return; + if (!(item instanceof BlockItem blockItem)) return; - BlockItem blockItem = (BlockItem) item; - if (!(blockItem.getBlock() instanceof IllumarLampBlock)) return; + if (!(blockItem.getBlock() instanceof IllumarLampBlock block)) return; - IllumarLampBlock block = (IllumarLampBlock) blockItem.getBlock(); if (!block.isInverted()) { // Non-inverted blocks can use default Minecraft BlockItem model. Shouldn't happen // because this renderer should only be registered to inverted variants. diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java index 29925cd61..28fd15e5c 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationItemModelProvider.java @@ -34,10 +34,9 @@ protected void registerModels() { } for (MultipartLightType type : MultipartLightType.values()) { - ModelFile modelFile = getExistingFile(modLoc("item/" + type.getUnlocalBaseName())); for (int color = 0; color < 16; color++) { - getSimple(type.getItem(color, false)).noTexture().parent(modelFile); - getSimple(type.getItem(color, true)).noTexture().parent(modelFile); + generated(type.getItem(color, false)).noTexture(); + generated(type.getItem(color, true)).noTexture(); } } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationRecipeProvider.java b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationRecipeProvider.java index 3b6fa23ef..b7233a8e9 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationRecipeProvider.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/data/IlluminationRecipeProvider.java @@ -4,12 +4,11 @@ import mrtjp.projectred.illumination.BlockLightType; import mrtjp.projectred.illumination.MultipartLightType; import net.minecraft.data.DataGenerator; -import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; public class IlluminationRecipeProvider extends RecipeProvider { @@ -25,30 +24,11 @@ public String getName() { @Override protected void registerRecipes() { - Item[] illumars = { - WHITE_ILLUMAR_ITEM, - ORANGE_ILLUMAR_ITEM, - MAGENTA_ILLUMAR_ITEM, - LIGHT_BLUE_ILLUMAR_ITEM, - YELLOW_ILLUMAR_ITEM, - LIME_ILLUMAR_ITEM, - PINK_ILLUMAR_ITEM, - GRAY_ILLUMAR_ITEM, - LIGHT_GRAY_ILLUMAR_ITEM, - CYAN_ILLUMAR_ITEM, - PURPLE_ILLUMAR_ITEM, - BLUE_ILLUMAR_ITEM, - BROWN_ILLUMAR_ITEM, - GREEN_ILLUMAR_ITEM, - RED_ILLUMAR_ITEM, - BLACK_ILLUMAR_ITEM, - }; - //Lamps for (int c = 0; c < 16; c++) { shapedRecipe(BlockLightType.ILLUMAR_LAMP.getBlock(c, false), 1) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('R', Tags.Items.DUSTS_REDSTONE) .patternLine("GIG") .patternLine("GIG") @@ -56,7 +36,7 @@ protected void registerRecipes() { shapedRecipe(BlockLightType.ILLUMAR_LAMP.getBlock(c, true), 1) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('R', Items.REDSTONE_TORCH) .patternLine("GIG") .patternLine("GIG") @@ -66,20 +46,20 @@ protected void registerRecipes() { //Lanterns for (int c = 0; c < 16; c++) { shapedRecipe(MultipartLightType.LANTERN.getItem(c, false), 1) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .key('N', Tags.Items.NUGGETS_GOLD) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('R', Tags.Items.DUSTS_REDSTONE) .patternLine("PNP") .patternLine("GIG") .patternLine("PRP"); shapedRecipe(MultipartLightType.LANTERN.getItem(c, true), 1) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .key('N', Tags.Items.NUGGETS_GOLD) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('R', Items.REDSTONE_TORCH) .patternLine("PNP") .patternLine("GIG") @@ -90,18 +70,18 @@ protected void registerRecipes() { for (int c = 0; c < 16; c++) { shapedRecipe(MultipartLightType.FALLOUT.getItem(c, false), 1) .key('C', Blocks.IRON_BARS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('N', Tags.Items.NUGGETS_GOLD) - .key('P', CONDUCTIVE_PLATE_ITEM) + .key('P', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("CCC") .patternLine("CIC") .patternLine("NPN"); shapedRecipe(MultipartLightType.FALLOUT.getItem(c, true), 1) .key('C', Blocks.IRON_BARS) - .key('I', illumars[c]) + .key('I', getIllumarByIndex(c)) .key('N', Tags.Items.NUGGETS_GOLD) - .key('P', CATHODE_ITEM) + .key('P', CATHODE_ITEM.get()) .patternLine("CCC") .patternLine("CIC") .patternLine("NPN"); @@ -111,18 +91,18 @@ protected void registerRecipes() { for (int c = 0; c < 16; c++) { shapedRecipe(MultipartLightType.CAGE.getItem(c, false), 1) .key('C', Blocks.IRON_BARS) - .key('I', illumars[c]) - .key('N', PLATE_ITEM) - .key('P', CONDUCTIVE_PLATE_ITEM) + .key('I', getIllumarByIndex(c)) + .key('N', PLATE_ITEM.get()) + .key('P', CONDUCTIVE_PLATE_ITEM.get()) .patternLine(" C ") .patternLine("CIC") .patternLine("NPN"); shapedRecipe(MultipartLightType.CAGE.getItem(c, true), 1) .key('C', Blocks.IRON_BARS) - .key('I', illumars[c]) - .key('N', PLATE_ITEM) - .key('P', CATHODE_ITEM) + .key('I', getIllumarByIndex(c)) + .key('N', PLATE_ITEM.get()) + .key('P', CATHODE_ITEM.get()) .patternLine(" C ") .patternLine("CIC") .patternLine("NPN"); @@ -132,18 +112,18 @@ protected void registerRecipes() { for (int c = 0; c < 16; c++) { shapedRecipe(MultipartLightType.FIXTURE.getItem(c, false), 1) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) - .key('P', PLATE_ITEM) - .key('C', CONDUCTIVE_PLATE_ITEM) + .key('I', getIllumarByIndex(c)) + .key('P', PLATE_ITEM.get()) + .key('C', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("GGG") .patternLine("GIG") .patternLine("PCP"); shapedRecipe(MultipartLightType.FIXTURE.getItem(c, true), 1) .key('G', Tags.Items.GLASS_PANES_COLORLESS) - .key('I', illumars[c]) - .key('P', PLATE_ITEM) - .key('C', CATHODE_ITEM) + .key('I', getIllumarByIndex(c)) + .key('P', PLATE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) .patternLine("GGG") .patternLine("GIG") .patternLine("PCP"); diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationBlocks.java b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationBlocks.java index e44a1070b..76ca0448a 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationBlocks.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationBlocks.java @@ -10,7 +10,7 @@ public static void register() { // Block lights for (BlockLightType lampType : BlockLightType.values()) { - lampType.registerBlocks(BLOCKS, ITEMS, TILE_ENTITIES); + lampType.registerBlocks(BLOCKS, ITEMS, BLOCK_ENTITY_TYPES); } } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java index 62a742d7f..0a3fdd72b 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationClientInit.java @@ -1,47 +1,32 @@ package mrtjp.projectred.illumination.init; import codechicken.lib.model.ModelRegistryHelper; -import codechicken.lib.render.item.IItemRenderer; import codechicken.lib.texture.SpriteRegistryHelper; import codechicken.multipart.api.MultipartClientRegistry; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonObject; -import com.mojang.datafixers.util.Pair; import mrtjp.projectred.illumination.BlockLightType; import mrtjp.projectred.illumination.MultipartLightType; import mrtjp.projectred.illumination.client.IllumarLampItemRenderer; import mrtjp.projectred.illumination.client.IllumarLampTileRenderer; import mrtjp.projectred.illumination.client.MultipartLightPartRenderer; import net.covers1624.quack.util.SneakyUtils; -import net.minecraft.client.renderer.block.model.ItemOverrides; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.*; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.geometry.IModelGeometry; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import java.util.Collection; -import java.util.Collections; import java.util.Objects; -import java.util.Set; -import java.util.function.Function; - -import static mrtjp.projectred.illumination.ProjectRedIllumination.MOD_ID; public class IlluminationClientInit { + + private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); + public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(IlluminationClientInit::clientSetup); - modEventBus.addListener(IlluminationClientInit::onModelRegistryEvent); // Register Sprites SpriteRegistryHelper iconRegister = new SpriteRegistryHelper(); @@ -74,41 +59,21 @@ private static void clientSetup(final FMLClientSetupEvent event) { } } - // Register part renderers + // Register light part renderers for (MultipartLightType type : MultipartLightType.values()) { for (int colour = 0; colour < 16; colour++) { + // Block renderers MultipartClientRegistry.register(type.getPartType(colour, false), MultipartLightPartRenderer.INSTANCE); MultipartClientRegistry.register(type.getPartType(colour, true), MultipartLightPartRenderer.INSTANCE); - } - } - } - - private static void onModelRegistryEvent(ModelRegistryEvent event) { - // Add model loader that points to an IItemRenderer instance - for (MultipartLightType type : MultipartLightType.values()) { - ModelLoaderRegistry.registerLoader( - new ResourceLocation(MOD_ID, type.getUnlocalBaseName()), - new GenericModelLoader(type.getProperties().getItemRenderer())); - } - } - - private static class GenericModelLoader implements IModelGeometry, IModelLoader { - - private final IItemRenderer renderer; - public GenericModelLoader(IItemRenderer renderer) { - this.renderer = renderer; - } - - @Override - public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation) { - return renderer; + // Item renderers + MODEL_HELPER.register( + new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject(colour, false).getId()), "inventory"), + type.getProperties().getItemRenderer()); + MODEL_HELPER.register( + new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject(colour, true).getId()), "inventory"), + type.getProperties().getItemRenderer()); + } } - - //@formatter:off - @Override public GenericModelLoader read(JsonDeserializationContext deserializationContext, JsonObject modelContents) { return this; } - public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { return Collections.emptySet(); } - @Override public void onResourceManagerReload(ResourceManager resourceManager) {} - //@formatter:on } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationParts.java b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationParts.java index c83f202b7..b87b010c2 100644 --- a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationParts.java +++ b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationParts.java @@ -3,14 +3,14 @@ import mrtjp.projectred.illumination.MultipartLightType; import static mrtjp.projectred.illumination.ProjectRedIllumination.ITEMS; -import static mrtjp.projectred.illumination.ProjectRedIllumination.PARTS; +import static mrtjp.projectred.illumination.ProjectRedIllumination.PART_TYPES; public class IlluminationParts { public static void register() { for (MultipartLightType type : MultipartLightType.values()) { - type.registerParts(PARTS, ITEMS); + type.registerParts(PART_TYPES, ITEMS); } } } diff --git a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationReferences.java b/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationReferences.java deleted file mode 100644 index 49365f81e..000000000 --- a/illumination/src/main/java/mrtjp/projectred/illumination/init/IlluminationReferences.java +++ /dev/null @@ -1,6 +0,0 @@ -package mrtjp.projectred.illumination.init; - -public class IlluminationReferences { - - -} diff --git a/illumination/src/main/resources/assets/projectred_illumination/models/item/cage_light.json b/illumination/src/main/resources/assets/projectred_illumination/models/item/cage_light.json deleted file mode 100644 index 4ffeac400..000000000 --- a/illumination/src/main/resources/assets/projectred_illumination/models/item/cage_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_illumination:cage_light" -} \ No newline at end of file diff --git a/illumination/src/main/resources/assets/projectred_illumination/models/item/fallout_light.json b/illumination/src/main/resources/assets/projectred_illumination/models/item/fallout_light.json deleted file mode 100644 index da3846e2b..000000000 --- a/illumination/src/main/resources/assets/projectred_illumination/models/item/fallout_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_illumination:fallout_light" -} \ No newline at end of file diff --git a/illumination/src/main/resources/assets/projectred_illumination/models/item/fixture_light.json b/illumination/src/main/resources/assets/projectred_illumination/models/item/fixture_light.json deleted file mode 100644 index b807890bb..000000000 --- a/illumination/src/main/resources/assets/projectred_illumination/models/item/fixture_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_illumination:fixture_light" -} \ No newline at end of file diff --git a/illumination/src/main/resources/assets/projectred_illumination/models/item/lantern.json b/illumination/src/main/resources/assets/projectred_illumination/models/item/lantern.json deleted file mode 100644 index fc20b5546..000000000 --- a/illumination/src/main/resources/assets/projectred_illumination/models/item/lantern.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_illumination:lantern" -} \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/and_cell_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/and_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_cell_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/buffer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_converter_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_input_panel_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_randomizer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/bus_transceiver_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/comparator_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/counter_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/dec_randomizer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/invert_cell_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/light_sensor_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/multiplexer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/nand_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/nor_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/not_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/null_cell_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/or_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/pulse_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/rain_sensor_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/randomizer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/repeater_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/segment_display_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/sequencer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/sr_latch_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/stacking_latch_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/state_cell_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/synchronizer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/timer_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/toggle_latch_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/transparent_latch_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/xnor_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json b/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json index 4f0bb86c2..1bcbb312f 100644 --- a/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json +++ b/integration/src/main/generated/assets/projectred_integration/models/item/xor_gate.json @@ -1,3 +1,3 @@ { - "parent": "projectred_integration:item/gate" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/integration/src/main/java/mrtjp/projectred/integration/GateType.java b/integration/src/main/java/mrtjp/projectred/integration/GateType.java index b526971ef..0908dd01b 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/GateType.java +++ b/integration/src/main/java/mrtjp/projectred/integration/GateType.java @@ -57,16 +57,19 @@ public enum GateType private @Nullable String unlocalName; private @Nullable Function partFactory; - private @Nullable RegistryObject itemSupplier; + private @Nullable RegistryObject itemSupplier; private @Nullable RegistryObject> partSupplier; + private boolean isExternalGate; + GateType(@Nullable String unlocalName, @Nullable Function partFactory) { this.unlocalName = unlocalName; this.partFactory = partFactory; + this.isExternalGate = partFactory == null; } - public boolean isEnabled() { - return partFactory != null; + public boolean isExternalGate() { + return isExternalGate; } public String getUnlocalizedName() { @@ -74,6 +77,11 @@ public String getUnlocalizedName() { return unlocalName; } + public RegistryObject getItemRegistryObject() { + assert itemSupplier != null; + return itemSupplier; + } + public Item getItem() { assert itemSupplier != null; return itemSupplier.get(); @@ -99,7 +107,7 @@ public void registerParts(DeferredRegister> partRegistry, Defer } // TODO: Add proper gate registering mechanism - public void inject(String unlocalName, Function partFactory, RegistryObject itemSupplier, RegistryObject> partSupplier) { + public void inject(String unlocalName, Function partFactory, RegistryObject itemSupplier, RegistryObject> partSupplier) { if (this.itemSupplier != null || this.partSupplier != null) { throw new RuntimeException("GateType " + name() + " already registered!"); } diff --git a/integration/src/main/java/mrtjp/projectred/integration/IntegrationNetwork.java b/integration/src/main/java/mrtjp/projectred/integration/IntegrationNetwork.java index 569cf2128..a8ba5439d 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/IntegrationNetwork.java +++ b/integration/src/main/java/mrtjp/projectred/integration/IntegrationNetwork.java @@ -107,16 +107,14 @@ public void handlePacket(PacketCustom packet, ServerPlayer sender, ServerGamePac private void handleIncrTimerMessage(Level world, PacketCustom packet) { MultiPart part = readPartIndex(world, packet); - if (part instanceof ComplexGatePart.ITimerGuiLogic) { - ComplexGatePart.ITimerGuiLogic gate = (ComplexGatePart.ITimerGuiLogic) part; + if (part instanceof ComplexGatePart.ITimerGuiLogic gate) { gate.setTimerMax(gate.getTimerMax() + packet.readShort()); } } private void handleIncrCounterMessage(Level world, PacketCustom packet) { MultiPart part = readPartIndex(world, packet); - if (part instanceof ComplexGatePart.ICounterGuiLogic) { - ComplexGatePart.ICounterGuiLogic gate = (ComplexGatePart.ICounterGuiLogic) part; + if (part instanceof ComplexGatePart.ICounterGuiLogic gate) { int actionId = packet.readByte(); switch (actionId) { case 0: diff --git a/integration/src/main/java/mrtjp/projectred/integration/ProjectRedIntegration.java b/integration/src/main/java/mrtjp/projectred/integration/ProjectRedIntegration.java index e606eac99..35a5393b5 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/ProjectRedIntegration.java +++ b/integration/src/main/java/mrtjp/projectred/integration/ProjectRedIntegration.java @@ -32,7 +32,7 @@ public class ProjectRedIntegration { public static final Logger LOGGER = LogManager.getLogger(MOD_ID); public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); + public static final DeferredRegister> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); public static final SimpleCreativeTab CREATIVE_TAB = new SimpleCreativeTab(MOD_ID, GateType.OR::makeStack); @@ -49,7 +49,7 @@ public ProjectRedIntegration() { DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> IntegrationClientInit::init); ITEMS.register(modEventBus); - PARTS.register(modEventBus); + PART_TYPES.register(modEventBus); } private void commonSetup(final FMLCommonSetupEvent event) { diff --git a/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java b/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java index d423efb5e..a229bbd80 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java +++ b/integration/src/main/java/mrtjp/projectred/integration/client/GatePartItemRenderer.java @@ -39,9 +39,7 @@ public ModelState getModelTransform() { @Override public void renderItem(ItemStack stack, ItemTransforms.TransformType transformType, PoseStack mStack, MultiBufferSource getter, int packedLight, int packedOverlay) { - if (!(stack.getItem() instanceof GatePartItem)) return; - - GatePartItem gateItem = (GatePartItem) stack.getItem(); + if (!(stack.getItem() instanceof GatePartItem gateItem)) return; CCRenderState ccrs = CCRenderState.instance(); ccrs.reset(); diff --git a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java index a78c6b28f..0ff215d92 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java +++ b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationItemModelProvider.java @@ -26,10 +26,9 @@ public String getName() { @Override protected void registerModels() { - ModelFile.ExistingModelFile gate = getExistingFile(new ResourceLocation(MOD_ID, "item/gate")); for (GateType type : GateType.values()) { - if (!type.isEnabled()) continue; - getSimple(type.getItem()).noTexture().parent(gate); + if (type.isExternalGate()) continue; + generated(type.getItem()).noTexture(); } } } diff --git a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationRecipeProvider.java b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationRecipeProvider.java index 1db6a46cd..76faaccbc 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationRecipeProvider.java +++ b/integration/src/main/java/mrtjp/projectred/integration/data/IntegrationRecipeProvider.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; import static mrtjp.projectred.core.init.CoreTags.ILLUMAR_TAG; public class IntegrationRecipeProvider extends RecipeProvider { @@ -25,134 +25,134 @@ protected void registerRecipes() { //OR gate shapedRecipe(GateType.OR.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("PCP") .patternLine("WCW") .patternLine("PWP"); //NOR gate shapedRecipe(GateType.NOR.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("PAP") .patternLine("WCW") .patternLine("PWP"); //NOT gate shapedRecipe(GateType.NOT.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("PCP") .patternLine("CAC") .patternLine("PWP"); // AND gate shapedRecipe(GateType.AND.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACA") .patternLine("CCC") .patternLine("PWP"); //NAND gate shapedRecipe(GateType.NAND.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("AAA") .patternLine("CCC") .patternLine("PWP"); //XOR gate shapedRecipe(GateType.XOR.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("AWA") .patternLine("CAC") .patternLine("WCW"); //XNOR gate shapedRecipe(GateType.XNOR.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACA") .patternLine("CAC") .patternLine("WCW"); //Buffer gate shapedRecipe(GateType.BUFFER.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACA") .patternLine("WCW") .patternLine("PWP"); //Multiplexer gate shapedRecipe(GateType.MULTIPLEXER.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACA") .patternLine("CPC") .patternLine("ACW"); //Pulse gate shapedRecipe(GateType.PULSE.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACA") .patternLine("CAC") .patternLine("WWP"); //Repeater gate shapedRecipe(GateType.REPEATER.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("PCA") .patternLine("ACP") .patternLine("PWP"); //Randomizer gate shapedRecipe(GateType.RANDOMIZER.getItem(), 1) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) - .key('E', ENERGIZED_SILICON_CHIP_ITEM) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) + .key('E', ENERGIZED_SILICON_CHIP_ITEM.get()) .patternLine("PEP") .patternLine("WWW") .patternLine("EWE"); //SR latch gate shapedRecipe(GateType.SR_LATCH.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACW") .patternLine("WPW") .patternLine("WCA"); //Toggle latch gate shapedRecipe(GateType.TOGGLE_LATCH.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .key('L', Blocks.LEVER) .patternLine("CPP") .patternLine("WLW") @@ -160,18 +160,18 @@ protected void registerRecipes() { //Transparent latch gate shapedRecipe(GateType.TRANSPARENT_LATCH.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("ACW") .patternLine("CCC") .patternLine("CWP"); //Light sensor gate shapedRecipe(GateType.LIGHT_SENSOR.getItem(), 1) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .key('B', Tags.Items.DYES_BLUE) .patternLine("PPP") .patternLine("BBB") @@ -179,8 +179,8 @@ protected void registerRecipes() { //Rain sensor gate shapedRecipe(GateType.RAIN_SENSOR.getItem(), 1) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .key('S', Tags.Items.SLIMEBALLS) .patternLine("PPP") .patternLine("SSS") @@ -188,99 +188,99 @@ protected void registerRecipes() { //Timer gate shapedRecipe(GateType.TIMER.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) - .key('T', POINTER_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) + .key('T', POINTER_ITEM.get()) .patternLine("ACA") .patternLine("WTW") .patternLine("PWP"); //Sequencer gate shapedRecipe(GateType.SEQUENCER.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('T', POINTER_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('T', POINTER_ITEM.get()) .patternLine("PCP") .patternLine("CTC") .patternLine("PCP"); //Counter gate shapedRecipe(GateType.COUNTER.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) - .key('T', POINTER_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) + .key('T', POINTER_ITEM.get()) .patternLine("PCP") .patternLine("WWT") .patternLine("PCP"); //State cell gate shapedRecipe(GateType.STATE_CELL.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) - .key('T', POINTER_ITEM) - .key('S', SILICON_CHIP_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) + .key('T', POINTER_ITEM.get()) + .key('S', SILICON_CHIP_ITEM.get()) .patternLine("PAC") .patternLine("WST") .patternLine("PWP"); //Synchronizer gate shapedRecipe(GateType.SYNCHRONIZER.getItem(), 1) - .key('A', ANODE_ITEM) - .key('C', CATHODE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) - .key('S', SILICON_CHIP_ITEM) + .key('A', ANODE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) + .key('S', SILICON_CHIP_ITEM.get()) .patternLine("WCW") .patternLine("SAS") .patternLine("WWW"); //Bus tranceiver gate shapedRecipe(GateType.BUS_TRANSCEIVER.getItem(), 1) - .key('P', PLATE_ITEM) - .key('B', BUNDLED_PLATE_ITEM) - .key('S', SILICON_CHIP_ITEM) + .key('P', PLATE_ITEM.get()) + .key('B', BUNDLED_PLATE_ITEM.get()) + .key('S', SILICON_CHIP_ITEM.get()) .patternLine("BBB") .patternLine("SPS") .patternLine("BBB"); //Null cell gate shapedRecipe(GateType.NULL_CELL.getItem(), 1) - .key('P', PLATE_ITEM) - .key('W', WIRED_PLATE_ITEM) - .key('F', PLATFORMED_PLATE_ITEM) + .key('P', PLATE_ITEM.get()) + .key('W', WIRED_PLATE_ITEM.get()) + .key('F', PLATFORMED_PLATE_ITEM.get()) .patternLine("PWP") .patternLine("WFW") .patternLine("PWP"); //Invert cell gate shapedRecipe(GateType.INVERT_CELL.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', WIRED_PLATE_ITEM) - .key('F', PLATFORMED_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', WIRED_PLATE_ITEM.get()) + .key('F', PLATFORMED_PLATE_ITEM.get()) .patternLine("PWP") .patternLine("WFW") .patternLine("PCP"); //Buffer cell gate shapedRecipe(GateType.BUFFER_CELL.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', WIRED_PLATE_ITEM) - .key('F', PLATFORMED_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', WIRED_PLATE_ITEM.get()) + .key('F', PLATFORMED_PLATE_ITEM.get()) .patternLine("PWP") .patternLine("WFW") .patternLine("PCC"); //Comparator gate shapedRecipe(GateType.COMPARATOR.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .key('Q', Tags.Items.GEMS_QUARTZ) .patternLine("WCW") .patternLine("QWQ") @@ -288,38 +288,38 @@ protected void registerRecipes() { //AND cell gate shapedRecipe(GateType.AND_CELL.getItem(), 1) - .key('C', CATHODE_ITEM) - .key('P', PLATE_ITEM) - .key('w', CONDUCTIVE_PLATE_ITEM) - .key('W', WIRED_PLATE_ITEM) - .key('S', PLATFORMED_PLATE_ITEM) + .key('C', CATHODE_ITEM.get()) + .key('P', PLATE_ITEM.get()) + .key('w', CONDUCTIVE_PLATE_ITEM.get()) + .key('W', WIRED_PLATE_ITEM.get()) + .key('S', PLATFORMED_PLATE_ITEM.get()) .patternLine("CwC") .patternLine("WSW") .patternLine("PwC"); //Bus randomizer gate shapedRecipe(GateType.BUS_RANDOMIZER.getItem(), 1) - .key('R', CONDUCTIVE_PLATE_ITEM) - .key('B', BUNDLED_PLATE_ITEM) - .key('G', ENERGIZED_SILICON_CHIP_ITEM) + .key('R', CONDUCTIVE_PLATE_ITEM.get()) + .key('B', BUNDLED_PLATE_ITEM.get()) + .key('G', ENERGIZED_SILICON_CHIP_ITEM.get()) .patternLine("BBB") .patternLine("RGR") .patternLine("BBB"); //Bus converter gate shapedRecipe(GateType.BUS_CONVERTER.getItem(), 1) - .key('P', PLATE_ITEM) - .key('B', BUNDLED_PLATE_ITEM) - .key('R', CONDUCTIVE_PLATE_ITEM) - .key('S', SILICON_CHIP_ITEM) + .key('P', PLATE_ITEM.get()) + .key('B', BUNDLED_PLATE_ITEM.get()) + .key('R', CONDUCTIVE_PLATE_ITEM.get()) + .key('S', SILICON_CHIP_ITEM.get()) .patternLine("PBP") .patternLine("RSR") .patternLine("PRP"); //Bus input panel gate shapedRecipe(GateType.BUS_INPUT_PANEL.getItem(), 1) - .key('B', BUNDLED_PLATE_ITEM) - .key('R', CONDUCTIVE_PLATE_ITEM) + .key('B', BUNDLED_PLATE_ITEM.get()) + .key('R', CONDUCTIVE_PLATE_ITEM.get()) .key('I', ILLUMAR_TAG) .patternLine("BRB") .patternLine("BIB") @@ -327,19 +327,19 @@ protected void registerRecipes() { //Stacking latch gate shapedRecipe(GateType.TRANSPARENT_LATCH_CELL.getItem(), 1) - .key('P', PLATE_ITEM) - .key('C', CATHODE_ITEM) - .key('R', WIRED_PLATE_ITEM) + .key('P', PLATE_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('R', WIRED_PLATE_ITEM.get()) .patternLine("PCP") .patternLine("RCR") .patternLine("PCC"); //Segment display gate shapedRecipe(GateType.SEGMENT_DISPLAY.getItem(), 1) - .key('P', PLATE_ITEM) - .key('B', BUNDLED_PLATE_ITEM) + .key('P', PLATE_ITEM.get()) + .key('B', BUNDLED_PLATE_ITEM.get()) .key('Q', Tags.Items.GEMS_QUARTZ) - .key('S', SILICON_CHIP_ITEM) + .key('S', SILICON_CHIP_ITEM.get()) .patternLine("PBP") .patternLine("QSQ") .patternLine("PQP"); @@ -347,11 +347,11 @@ protected void registerRecipes() { //Dec randomizer gate shapedRecipe(GateType.DEC_RANDOMIZER.getItem(), 1) - .key('S', SILICON_CHIP_ITEM) - .key('C', CATHODE_ITEM) - .key('A', ANODE_ITEM) - .key('E', ENERGIZED_SILICON_CHIP_ITEM) - .key('W', CONDUCTIVE_PLATE_ITEM) + .key('S', SILICON_CHIP_ITEM.get()) + .key('C', CATHODE_ITEM.get()) + .key('A', ANODE_ITEM.get()) + .key('E', ENERGIZED_SILICON_CHIP_ITEM.get()) + .key('W', CONDUCTIVE_PLATE_ITEM.get()) .patternLine("SCA") .patternLine("CCC") .patternLine("EWE"); diff --git a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java index ce8428ea8..11e7a5cc8 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java +++ b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationClientInit.java @@ -1,44 +1,28 @@ package mrtjp.projectred.integration.init; -import codechicken.lib.render.item.IItemRenderer; +import codechicken.lib.model.ModelRegistryHelper; import codechicken.lib.texture.SpriteRegistryHelper; import codechicken.lib.util.ResourceUtils; import codechicken.multipart.api.MultipartClientRegistry; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonObject; -import com.mojang.datafixers.util.Pair; import mrtjp.projectred.integration.GateType; import mrtjp.projectred.integration.client.GateModelRenderer; import mrtjp.projectred.integration.client.GatePartItemRenderer; import mrtjp.projectred.integration.client.GatePartRenderer; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.*; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.geometry.IModelGeometry; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.function.Function; - -import static mrtjp.projectred.integration.ProjectRedIntegration.MOD_ID; +import java.util.Objects; public class IntegrationClientInit { + private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); + public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(IntegrationClientInit::clientSetup); - modEventBus.addListener(IntegrationClientInit::onModelRegistryEvent); // Register sprites SpriteRegistryHelper spriteHelper = new SpriteRegistryHelper(modEventBus); @@ -47,39 +31,16 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { - // Register part item renderers for (GateType type : GateType.values()) { - if (!type.isEnabled()) continue; - MultipartClientRegistry.register(type.getPartType(), GatePartRenderer.INSTANCE); - } - - ResourceUtils.registerReloadListener(GateModelRenderer::onResourceManagerReload); - } - - private static void onModelRegistryEvent(ModelRegistryEvent event) { + if (type.isExternalGate()) continue; - // Register part model loader - ModelLoaderRegistry.registerLoader(new ResourceLocation(MOD_ID, "gate"), new GenericModelLoader(GatePartItemRenderer.INSTANCE)); - } - - // Dummy model loader that represents an IItemRenderer - private static class GenericModelLoader implements IModelGeometry, IModelLoader { - - private final IItemRenderer renderer; - - public GenericModelLoader(IItemRenderer renderer) { - this.renderer = renderer; - } + // Register part block renderers + MultipartClientRegistry.register(type.getPartType(), GatePartRenderer.INSTANCE); - @Override - public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation) { - return renderer; + // Register part item renderer + MODEL_HELPER.register(new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject().getId()), "inventory"), GatePartItemRenderer.INSTANCE); } - //@formatter:off - @Override public GenericModelLoader read(JsonDeserializationContext deserializationContext, JsonObject modelContents) { return this; } - @Override public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { return Collections.emptyList(); } - @Override public void onResourceManagerReload(ResourceManager resourceManager) {} - //@formatter:on + ResourceUtils.registerReloadListener(GateModelRenderer::onResourceManagerReload); } } diff --git a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationParts.java b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationParts.java index fd8878c35..b486926d2 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationParts.java +++ b/integration/src/main/java/mrtjp/projectred/integration/init/IntegrationParts.java @@ -3,7 +3,7 @@ import mrtjp.projectred.integration.GateType; import static mrtjp.projectred.integration.ProjectRedIntegration.ITEMS; -import static mrtjp.projectred.integration.ProjectRedIntegration.PARTS; +import static mrtjp.projectred.integration.ProjectRedIntegration.PART_TYPES; public class IntegrationParts { @@ -44,8 +44,8 @@ public class IntegrationParts { public static void register() { for (GateType type : GateType.values()) { - if (!type.isEnabled()) continue; - type.registerParts(PARTS, ITEMS); + if (type.isExternalGate()) continue; + type.registerParts(PART_TYPES, ITEMS); } } } diff --git a/integration/src/main/java/mrtjp/projectred/integration/part/ArrayGatePart.java b/integration/src/main/java/mrtjp/projectred/integration/part/ArrayGatePart.java index 553deaed1..621f4389c 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/part/ArrayGatePart.java +++ b/integration/src/main/java/mrtjp/projectred/integration/part/ArrayGatePart.java @@ -84,12 +84,10 @@ public void propagateOther(int mode) { } private int sideDiff(@Nullable IPropagationPart p) { - if (!(p instanceof MultiPart)) return 0xF; + if (!(p instanceof MultiPart part)) return 0xF; - if (!(p instanceof IOrientableFacePart)) return 0xF; + if (!(p instanceof IOrientableFacePart facePart)) return 0xF; - MultiPart part = (MultiPart) p; - IOrientableFacePart facePart = (IOrientableFacePart) p; BlockPos here = pos(); BlockPos there = part.pos(); @@ -165,8 +163,7 @@ protected int calcInsideSignal(int r) { protected int resolveSignal(FaceLookup lookup) { // Part signal resolution - if (lookup.part instanceof IRedwirePart) { - IRedwirePart redwirePart = (IRedwirePart) lookup.part; + if (lookup.part instanceof IRedwirePart redwirePart) { if (redwirePart.diminishOnSide(lookup.otherRotation)) { return redwirePart.getRedwireSignal(lookup.otherRotation) - 1; } @@ -177,8 +174,7 @@ protected int resolveSignal(FaceLookup lookup) { } // Shouldn't matter, no space for a face part inside - if (lookup.part instanceof FaceRedstonePart) { - FaceRedstonePart faceRsPart = (FaceRedstonePart) lookup.part; + if (lookup.part instanceof FaceRedstonePart faceRsPart) { int s = Rotation.rotateSide(lookup.otherSide, lookup.otherRotation); return Math.max(faceRsPart.strongPowerLevel(s), faceRsPart.weakPowerLevel(s)) * 17; } @@ -262,8 +258,7 @@ public void preparePlacement(@Nullable Player player, BlockPos pos, int side) { if (canCross() && player != null) { // Note: tile() is not available yet, must access from player.level MultiPart tpart = BlockMultipart.getPart(player.level, pos, getSide()^1); - if (tpart instanceof ArrayGatePart) { - ArrayGatePart part = (ArrayGatePart) tpart; + if (tpart instanceof ArrayGatePart part) { if (part.getGateType() == getGateType() && (part.getRotation() & 1) == (getRotation() & 1)) { setRotation((getRotation() + 1) % 4); } @@ -273,8 +268,7 @@ public void preparePlacement(@Nullable Player player, BlockPos pos, int side) { @Override public boolean occlusionTest(MultiPart npart) { - if (npart instanceof ArrayGatePart) { - ArrayGatePart part = (ArrayGatePart) npart; + if (npart instanceof ArrayGatePart part) { if (part.getGateType() == getGateType() && part.getSide() == (getSide() ^ 1) && (part.getRotation() & 1) != (getRotation() & 1)) { return true; } @@ -352,9 +346,7 @@ static int getConnsAtHeight(GatePart gate, double h) { static double getConnHeight(GatePart gate, int r) { IConnectable part = gate.getStraight(r); - if (part instanceof IGateWireRenderConnect && part instanceof GatePart) { - GatePart gPart = (GatePart) part; - IGateWireRenderConnect gConn = (IGateWireRenderConnect) part; + if (part instanceof IGateWireRenderConnect gConn && part instanceof GatePart gPart) { int ir = gPart.toInternal(gate.rotFromStraight(r)); if ((gConn.renderConnectMask() & 1 << ir) != 0) return gConn.getHeight(ir); } diff --git a/integration/src/main/java/mrtjp/projectred/integration/part/BundledGatePart.java b/integration/src/main/java/mrtjp/projectred/integration/part/BundledGatePart.java index ae5d1f344..36f117ffe 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/part/BundledGatePart.java +++ b/integration/src/main/java/mrtjp/projectred/integration/part/BundledGatePart.java @@ -98,8 +98,7 @@ public BundledGatePart(GateType type) { public boolean discoverStraightOverride(int absDir) { BlockPos pos = pos().relative(Direction.values()[absDir]); BlockEntity tile = level().getBlockEntity(pos); - if (tile instanceof IMaskedBundledTile) { - IMaskedBundledTile b = (IMaskedBundledTile) tile; + if (tile instanceof IMaskedBundledTile b) { int r = Rotation.rotationTo(absDir, getSide()); return b.canConnectBundled(absDir ^ 1) && (b.getConnectionMask(absDir ^ 1) & 1 << r) != 0; } diff --git a/integration/src/main/java/mrtjp/projectred/integration/part/GatePart.java b/integration/src/main/java/mrtjp/projectred/integration/part/GatePart.java index eab33954b..620fde507 100644 --- a/integration/src/main/java/mrtjp/projectred/integration/part/GatePart.java +++ b/integration/src/main/java/mrtjp/projectred/integration/part/GatePart.java @@ -419,8 +419,7 @@ public int getSlotMask() { public InteractionResult activate(Player player, PartRayTraceResult hit, ItemStack held, InteractionHand hand) { if (gateLogicActivate(player, held, hit)) return InteractionResult.SUCCESS; - if (!held.isEmpty() && held.getItem() instanceof IScrewdriver) { - IScrewdriver screwdriver = (IScrewdriver) held.getItem(); + if (!held.isEmpty() && held.getItem() instanceof IScrewdriver screwdriver) { if (!level().isClientSide) { if (player.isCrouching()) { configure(); diff --git a/integration/src/main/resources/assets/projectred_integration/models/item/gate.json b/integration/src/main/resources/assets/projectred_integration/models/item/gate.json deleted file mode 100644 index 0ff5f24a1..000000000 --- a/integration/src/main/resources/assets/projectred_integration/models/item/gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_integration:gate" -} \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/black_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/blue_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/brown_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/cyan_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/framed_red_alloy_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/gray_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/green_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_blue_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/light_gray_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/lime_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_framed_power_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/low_load_power_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/magenta_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/neutral_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/orange_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/pink_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/purple_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_alloy_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/red_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/white_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_bundled_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json index c07d974b7..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_framed_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/framed_wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json index 8eff53916..1bcbb312f 100644 --- a/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json +++ b/transmission/src/main/generated/assets/projectred_transmission/models/item/yellow_insulated_wire.json @@ -1,3 +1,3 @@ { - "parent": "projectred_transmission:item/wire" + "parent": "minecraft:item/generated" } \ No newline at end of file diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/ProjectRedTransmission.java b/transmission/src/main/java/mrtjp/projectred/transmission/ProjectRedTransmission.java index d5f73431e..1142863b7 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/ProjectRedTransmission.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/ProjectRedTransmission.java @@ -33,7 +33,7 @@ public class ProjectRedTransmission { public static final String MOD_ID = "projectred_transmission"; public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID); - public static final DeferredRegister> PARTS = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); + public static final DeferredRegister> PART_TYPES = DeferredRegister.create(MultipartType.MULTIPART_TYPES, MOD_ID); public static final SimpleCreativeTab TRANSMISSION_GROUP = new SimpleCreativeTab(MOD_ID, WireType.RED_ALLOY::makeStack); @@ -52,7 +52,7 @@ public ProjectRedTransmission() { DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> TransmissionClientInit::init); ITEMS.register(modEventBus); - PARTS.register(modEventBus); + PART_TYPES.register(modEventBus); MinecraftForge.EVENT_BUS.addListener(this::onServerStartEvent); } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/WireType.java b/transmission/src/main/java/mrtjp/projectred/transmission/WireType.java index bb684c441..f089d04d3 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/WireType.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/WireType.java @@ -157,6 +157,11 @@ public boolean isCenterPart() { return isCenterPart; } + public RegistryObject getItemRegistryObject() { + assert itemSupplier != null; + return itemSupplier; + } + public Item getItem() { return Objects.requireNonNull(itemSupplier).get(); } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWireHighlightRenderer.java b/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWireHighlightRenderer.java index 19b7f8529..b324302cd 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWireHighlightRenderer.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/client/FramedWireHighlightRenderer.java @@ -30,14 +30,12 @@ public boolean renderHighlight(Player player, InteractionHand hand, BlockHitResu return false; } - if (!(hit instanceof PartRayTraceResult)) return false; - PartRayTraceResult partHit = (PartRayTraceResult) hit; + if (!(hit instanceof PartRayTraceResult partHit)) return false; TileMultipart tile = BlockMultipart.getTile(player.level, hit.getBlockPos()); if (tile == null) return false; - if (partHit.part instanceof BaseCenterWirePart) { - BaseCenterWirePart wire = (BaseCenterWirePart) partHit.part; + if (partHit.part instanceof BaseCenterWirePart wire) { if (wire.getMaterial() == null || wire.getMaterial() != material) { FramedWireModelRenderer.renderCoverHighlight(wire, material, CCRenderState.instance(), mStack, getter); return true; diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/client/WireModelBuilder.java b/transmission/src/main/java/mrtjp/projectred/transmission/client/WireModelBuilder.java index fa5069f4d..9d3d6b21f 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/client/WireModelBuilder.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/client/WireModelBuilder.java @@ -90,17 +90,11 @@ private int countNumberOfFaces() { private void generateCenter() { - int tex; //0 = straight n/s, 1 = straight e/w, 2 = circle - switch (connCount) { - case 0: - tex = 1; - break; - case 1: - tex = (connMask & 5) != 0 ? 0 : 1; - break; - default: - tex = connMask == 5 ? 0 : connMask == 10 ? 1 : 2; - } + int tex = switch (connCount) { + case 0 -> 1; + case 1 -> (connMask & 5) != 0 ? 0 : 1; + default -> connMask == 5 ? 0 : connMask == 10 ? 1 : 2; + }; //0 = straight n/s, 1 = straight e/w, 2 = circle Vertex5[] verts = new Vertex5[] { new Vertex5(0.5 - w, h, 0.5 + w, 8 - tw, 16 + tw), @@ -253,16 +247,12 @@ private Vertex5[] generateInternal(int r) { } private Vertex5[] generateSideFromType(int stype, int r) { - switch (stype) { - case 0x00: - return generateFlat(r); - case 0x01: - return generateCorner(r); - case 0x10: - return generateStraight(r); - default: - return generateInternal(r); - } + return switch (stype) { + case 0x00 -> generateFlat(r); + case 0x01 -> generateCorner(r); + case 0x10 -> generateStraight(r); + default -> generateInternal(r); + }; } //region Utils diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java index e38d11883..422726c5f 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionItemModelProvider.java @@ -3,8 +3,6 @@ import codechicken.lib.datagen.ItemModelProvider; import mrtjp.projectred.transmission.WireType; import net.minecraft.data.DataGenerator; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; import static mrtjp.projectred.transmission.ProjectRedTransmission.MOD_ID; @@ -24,10 +22,8 @@ public String getName() { protected void registerModels() { // Wires and framed wires - ModelFile.ExistingModelFile wire = getExistingFile(new ResourceLocation(MOD_ID, "item/wire")); - ModelFile.ExistingModelFile framedWire = getExistingFile(new ResourceLocation(MOD_ID, "item/framed_wire")); for (WireType type : WireType.values()) { - getSimple(type.getItem()).noTexture().parent(type.isCenterPart() ? framedWire : wire); + generated(type.getItem()).noTexture(); } } } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionRecipeProvider.java b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionRecipeProvider.java index 749fe9183..0428f5b12 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionRecipeProvider.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/data/TransmissionRecipeProvider.java @@ -11,13 +11,12 @@ import net.minecraft.world.item.Item; import net.minecraftforge.common.Tags; -import static mrtjp.projectred.core.init.CoreReferences.*; +import static mrtjp.projectred.core.init.CoreItems.*; import static mrtjp.projectred.core.init.CoreTags.ELECTROTINE_ALLOY_INGOT_TAG; import static mrtjp.projectred.core.init.CoreTags.RED_ALLOY_INGOT_TAG; import static mrtjp.projectred.transmission.ProjectRedTransmission.MOD_ID; import static mrtjp.projectred.transmission.init.TransmissionTags.*; -@SuppressWarnings("DataFlowIssue") public class TransmissionRecipeProvider extends RecipeProvider { public TransmissionRecipeProvider(DataGenerator generatorIn) { @@ -113,16 +112,16 @@ protected void registerRecipes() { framedWireRecipe(WireType.FRAMED_POWER_LOWLOAD.getItem(), WireType.POWER_LOWLOAD.getItem()); // Wired plate - shapedRecipe(WIRED_PLATE_ITEM, 1, new ResourceLocation(MOD_ID, WIRED_PLATE_ITEM.getRegistryName().getPath())) + shapedRecipe(WIRED_PLATE_ITEM.get(), 1, new ResourceLocation(MOD_ID, WIRED_PLATE_ITEM.get().getRegistryName().getPath())) .key('W', WireType.RED_ALLOY.getItem()) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine("W") .patternLine("P"); // Bundled plate - shapedRecipe(BUNDLED_PLATE_ITEM, 1, new ResourceLocation(MOD_ID, BUNDLED_PLATE_ITEM.getRegistryName().getPath())) + shapedRecipe(BUNDLED_PLATE_ITEM.get(), 1, new ResourceLocation(MOD_ID, BUNDLED_PLATE_ITEM.get().getRegistryName().getPath())) .key('W', BUNDLED_WIRE_ITEM_TAG) - .key('P', PLATE_ITEM) + .key('P', PLATE_ITEM.get()) .patternLine("W") .patternLine("P"); } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java index 27e108927..0a125df1b 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionClientInit.java @@ -1,43 +1,27 @@ package mrtjp.projectred.transmission.init; -import codechicken.lib.render.item.IItemRenderer; +import codechicken.lib.model.ModelRegistryHelper; import codechicken.lib.texture.SpriteRegistryHelper; import codechicken.microblock.client.MicroMaterialClientRegistry; import codechicken.multipart.api.MultipartClientRegistry; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonObject; -import com.mojang.datafixers.util.Pair; import mrtjp.projectred.transmission.WireType; import mrtjp.projectred.transmission.client.*; import net.covers1624.quack.util.SneakyUtils; -import net.minecraft.client.renderer.block.model.ItemOverrides; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.*; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.client.model.geometry.IModelGeometry; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import java.util.Collection; -import java.util.Collections; -import java.util.Set; -import java.util.function.Function; - -import static mrtjp.projectred.transmission.ProjectRedTransmission.MOD_ID; +import java.util.Objects; public class TransmissionClientInit { + private static final ModelRegistryHelper MODEL_HELPER = new ModelRegistryHelper(); + public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); modEventBus.addListener(TransmissionClientInit::clientSetup); - modEventBus.addListener(TransmissionClientInit::onModelRegistryEvent); // Register sprites SpriteRegistryHelper spriteHelper = new SpriteRegistryHelper(modEventBus); @@ -48,41 +32,18 @@ public static void init() { private static void clientSetup(final FMLClientSetupEvent event) { - // Register part renderers + // Wire renderer registration for (WireType type : WireType.values()) { + // Block renderer MultipartClientRegistry.register(type.getPartType(), SneakyUtils.unsafeCast(type.isCenterPart() ? CenterWirePartRenderer.INSTANCE : FaceWirePartRenderer.INSTANCE)); + + // Item renderer + MODEL_HELPER.register(new ModelResourceLocation(Objects.requireNonNull(type.getItemRegistryObject().getId()), "inventory"), + type.isCenterPart() ? FramedWirePartItemRenderer.INSTANCE : WirePartItemRenderer.INSTANCE); } // Highlight renderer for cover-on-wire overlay MicroMaterialClientRegistry.registerGlobalHighlightRenderer(FramedWireHighlightRenderer.INSTANCE); } - - private static void onModelRegistryEvent(ModelRegistryEvent event) { - - // Register part model loaders - ModelLoaderRegistry.registerLoader(new ResourceLocation(MOD_ID, "wire"), new GenericModelLoader(WirePartItemRenderer.INSTANCE)); - ModelLoaderRegistry.registerLoader(new ResourceLocation(MOD_ID, "framed_wire"), new GenericModelLoader(FramedWirePartItemRenderer.INSTANCE)); - } - - // Dummy model loader that represents an IItemRenderer - private static class GenericModelLoader implements IModelGeometry, IModelLoader { - - private final IItemRenderer renderer; - - public GenericModelLoader(IItemRenderer renderer) { - this.renderer = renderer; - } - - @Override - public BakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation) { - return renderer; - } - - //@formatter:off - @Override public GenericModelLoader read(JsonDeserializationContext deserializationContext, JsonObject modelContents) { return this; } - @Override public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { return Collections.emptySet(); } - @Override public void onResourceManagerReload(ResourceManager resourceManager) {} - //@formatter:on - } } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionParts.java b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionParts.java index 4b9b2aa00..0d6af3f47 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionParts.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/init/TransmissionParts.java @@ -3,7 +3,7 @@ import mrtjp.projectred.transmission.WireType; import static mrtjp.projectred.transmission.ProjectRedTransmission.ITEMS; -import static mrtjp.projectred.transmission.ProjectRedTransmission.PARTS; +import static mrtjp.projectred.transmission.ProjectRedTransmission.PART_TYPES; public class TransmissionParts { @@ -93,7 +93,7 @@ public static void register() { // Register wires for (WireType type : WireType.values()) { - type.registerParts(PARTS, ITEMS); + type.registerParts(PART_TYPES, ITEMS); } } } diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/BaseFaceWirePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/BaseFaceWirePart.java index c83b7af8f..432d9ceb3 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/BaseFaceWirePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/BaseFaceWirePart.java @@ -242,8 +242,7 @@ public boolean canConnectCorner(int r) { @Override public boolean setRenderFlag(IConnectable part) { - if (part instanceof BaseFaceWirePart) { - BaseFaceWirePart wire = (BaseFaceWirePart) part; + if (part instanceof BaseFaceWirePart wire) { // For wires of same thickness, use side for tie-breaker as it // is guaranteed to be unique for a corner connected wire if (wire.getWireType().getThickness() == getWireType().getThickness()) { diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/BundledCablePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/BundledCablePart.java index c2f3100b8..60c0108fe 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/BundledCablePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/BundledCablePart.java @@ -133,8 +133,7 @@ public boolean canConnectPart(IConnectable part, int dir) { public boolean discoverStraightOverride(int absDir) { BlockPos pos = pos().relative(Direction.values()[absDir]); BlockEntity tile = level().getBlockEntity(pos); - if (tile instanceof IMaskedBundledTile) { - IMaskedBundledTile b = (IMaskedBundledTile) tile; + if (tile instanceof IMaskedBundledTile b) { int r = Rotation.rotationTo(absDir, getSide()); return b.canConnectBundled(absDir^1) && (b.getConnectionMask(absDir^1) & 1<< r) != 0; } @@ -218,8 +217,7 @@ protected void resolveSignal(FaceLookup lookup) { tmpSignal[i] = (byte) Math.max(tmpSignal[i] & 0xFF, (signalIn[i] & 0xFF) - 1); } - } else if (lookup.part instanceof IInsulatedRedwirePart) { - IInsulatedRedwirePart insulatedWire = (IInsulatedRedwirePart) lookup.part; + } else if (lookup.part instanceof IInsulatedRedwirePart insulatedWire) { int c = insulatedWire.getInsulatedColour(); int signalIn = insulatedWire.getRedwireSignal(lookup.otherRotation); tmpSignal[c] = (byte) Math.max(tmpSignal[c] & 0xFF, signalIn - 1); diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedBundledCablePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedBundledCablePart.java index 938256c20..9ebb27ba1 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedBundledCablePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedBundledCablePart.java @@ -129,8 +129,7 @@ public boolean canConnectPart(IConnectable part, int dir) { public boolean discoverStraightOverride(int absDir) { BlockPos pos = pos().relative(Direction.values()[absDir]); BlockEntity tile = level().getBlockEntity(pos); - if (tile instanceof IMaskedBundledTile) { - IMaskedBundledTile b = (IMaskedBundledTile) tile; + if (tile instanceof IMaskedBundledTile b) { return b.canConnectBundled(absDir^1) && (b.getConnectionMask(absDir^1) & 0x10) != 0; } @@ -198,8 +197,7 @@ protected void resolveSignal(CenterLookup lookup) { tmpSignal[i] = (byte) Math.max(tmpSignal[i] & 0xFF, (signalIn[i] & 0xFF) - 1); } - } else if (lookup.part instanceof IInsulatedRedwirePart) { - IInsulatedRedwirePart insulatedWire = (IInsulatedRedwirePart) lookup.part; + } else if (lookup.part instanceof IInsulatedRedwirePart insulatedWire) { int c = insulatedWire.getInsulatedColour(); int signalIn = insulatedWire.getRedwireSignal(lookup.otherDirection); tmpSignal[c] = (byte) Math.max(tmpSignal[c] & 0xFF, signalIn - 1); diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedInsulatedRedAlloyWirePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedInsulatedRedAlloyWirePart.java index 7b21dbe1e..423c4b3b9 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedInsulatedRedAlloyWirePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedInsulatedRedAlloyWirePart.java @@ -24,8 +24,7 @@ public TextureAtlasSprite getIcon() { //region FramedRedwirePart overrides @Override protected int resolveSignal(CenterLookup lookup) { - if (lookup.part instanceof IBundledCablePart) { - IBundledCablePart bundledPart = (IBundledCablePart) lookup.part; + if (lookup.part instanceof IBundledCablePart bundledPart) { return (bundledPart.getBundledSignal()[getInsulatedColour()] & 0xFF) - 1; } return super.resolveSignal(lookup); diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedRedwirePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedRedwirePart.java index adac9f21f..b3a314d87 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedRedwirePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/FramedRedwirePart.java @@ -233,8 +233,7 @@ protected int calculateInternalSignal(int s) { return signal; } - if (lookup.part instanceof RedstonePart) { - RedstonePart rw = (RedstonePart) lookup.part; + if (lookup.part instanceof RedstonePart rw) { return Math.max(rw.strongPowerLevel(lookup.otherDirection), rw.weakPowerLevel(lookup.otherDirection)); } @@ -242,8 +241,7 @@ protected int calculateInternalSignal(int s) { } protected int resolveSignal(CenterLookup lookup) { - if (lookup.part instanceof IRedwirePart) { - IRedwirePart rw = (IRedwirePart) lookup.part; + if (lookup.part instanceof IRedwirePart rw) { int signal = rw.getRedwireSignal(lookup.otherDirection); if (rw.diminishOnSide(lookup.otherDirection)) { diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/InsulatedRedAlloyWirePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/InsulatedRedAlloyWirePart.java index f40b54bea..f5e1c1918 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/InsulatedRedAlloyWirePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/InsulatedRedAlloyWirePart.java @@ -24,8 +24,7 @@ protected boolean powerUnderside() { @Override protected int resolveSignal(FaceLookup lookup) { - if (lookup.part instanceof IBundledCablePart) { - IBundledCablePart bundledPart = (IBundledCablePart) lookup.part; + if (lookup.part instanceof IBundledCablePart bundledPart) { return (bundledPart.getBundledSignal()[getInsulatedColour()] & 0xFF) - 1; } return super.resolveSignal(lookup); diff --git a/transmission/src/main/java/mrtjp/projectred/transmission/part/RedwirePart.java b/transmission/src/main/java/mrtjp/projectred/transmission/part/RedwirePart.java index b96c49914..c4aebfb75 100644 --- a/transmission/src/main/java/mrtjp/projectred/transmission/part/RedwirePart.java +++ b/transmission/src/main/java/mrtjp/projectred/transmission/part/RedwirePart.java @@ -267,8 +267,7 @@ protected int calcCenterSignal() { protected int resolveSignal(FaceLookup lookup) { // Part signal resolution - if (lookup.part instanceof IRedwirePart) { - IRedwirePart redwirePart = (IRedwirePart) lookup.part; + if (lookup.part instanceof IRedwirePart redwirePart) { if (redwirePart.diminishOnSide(lookup.otherRotation)) { return redwirePart.getRedwireSignal(lookup.otherRotation) - 1; } @@ -278,8 +277,7 @@ protected int resolveSignal(FaceLookup lookup) { return ((IRedwireEmitter) lookup.part).getRedwireSignal(lookup.otherRotation); } - if (lookup.part instanceof FaceRedstonePart) { - FaceRedstonePart faceRsPart = (FaceRedstonePart) lookup.part; + if (lookup.part instanceof FaceRedstonePart faceRsPart) { int s = Rotation.rotateSide(lookup.otherSide, lookup.otherRotation); return Math.max(faceRsPart.strongPowerLevel(s), faceRsPart.weakPowerLevel(s)) * 17; } diff --git a/transmission/src/main/resources/assets/projectred_transmission/models/item/framed_wire.json b/transmission/src/main/resources/assets/projectred_transmission/models/item/framed_wire.json deleted file mode 100644 index 34a8a6897..000000000 --- a/transmission/src/main/resources/assets/projectred_transmission/models/item/framed_wire.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_transmission:framed_wire" -} \ No newline at end of file diff --git a/transmission/src/main/resources/assets/projectred_transmission/models/item/wire.json b/transmission/src/main/resources/assets/projectred_transmission/models/item/wire.json deleted file mode 100644 index 8ac1a7447..000000000 --- a/transmission/src/main/resources/assets/projectred_transmission/models/item/wire.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "loader": "projectred_transmission:wire" -} \ No newline at end of file