From b1351f0a7509a077ea8ed62046e9eed5da84d386 Mon Sep 17 00:00:00 2001 From: 90 Date: Thu, 17 Aug 2023 21:36:26 +0100 Subject: [PATCH] move more shit around i guess --- .../java/gripe/_90/megacells/MEGACells.java | 2 - .../MEGACraftingBlockItem.java | 2 +- .../MEGAPatternProviderBlockItem.java | 2 +- .../_90/megacells/definition/MEGABlocks.java | 4 +- .../_90/megacells/definition/MEGAItems.java | 20 ++++++++ .../_90/megacells/definition/MEGAParts.java | 46 ------------------- .../part/MEGAPatternProviderPart.java | 4 +- .../MEGAPatternProviderPartItem.java | 3 +- .../_90/megacells/datagen/RecipeProvider.java | 9 ++-- .../_90/megacells/datagen/TagProvider.java | 3 +- .../_90/megacells/datagen/ModelProvider.java | 3 +- .../_90/megacells/datagen/RecipeProvider.java | 9 ++-- .../_90/megacells/datagen/TagProvider.java | 3 +- 13 files changed, 38 insertions(+), 72 deletions(-) rename common/src/main/java/gripe/_90/megacells/{item => block}/MEGACraftingBlockItem.java (98%) rename common/src/main/java/gripe/_90/megacells/{item => block}/MEGAPatternProviderBlockItem.java (95%) delete mode 100644 common/src/main/java/gripe/_90/megacells/definition/MEGAParts.java rename common/src/main/java/gripe/_90/megacells/{item => part}/MEGAPatternProviderPartItem.java (89%) diff --git a/common/src/main/java/gripe/_90/megacells/MEGACells.java b/common/src/main/java/gripe/_90/megacells/MEGACells.java index 87c92993..ef3b9412 100644 --- a/common/src/main/java/gripe/_90/megacells/MEGACells.java +++ b/common/src/main/java/gripe/_90/megacells/MEGACells.java @@ -20,7 +20,6 @@ import gripe._90.megacells.definition.MEGABlockEntities; import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.integration.ae2wt.AE2WTIntegration; import gripe._90.megacells.integration.appbot.AppBotIntegration; import gripe._90.megacells.integration.appbot.AppBotItems; @@ -47,7 +46,6 @@ public static void initCommon() { MEGAItems.init(); MEGABlocks.init(); MEGABlockEntities.init(); - MEGAParts.init(); if (MEGACells.PLATFORM.isAddonLoaded(Addons.APPBOT)) { AppBotItems.init(); diff --git a/common/src/main/java/gripe/_90/megacells/item/MEGACraftingBlockItem.java b/common/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java similarity index 98% rename from common/src/main/java/gripe/_90/megacells/item/MEGACraftingBlockItem.java rename to common/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java index d58441f4..8fb40a92 100644 --- a/common/src/main/java/gripe/_90/megacells/item/MEGACraftingBlockItem.java +++ b/common/src/main/java/gripe/_90/megacells/block/MEGACraftingBlockItem.java @@ -1,4 +1,4 @@ -package gripe._90.megacells.item; +package gripe._90.megacells.block; import static gripe._90.megacells.definition.MEGABlocks.CRAFTING_ACCELERATOR; import static gripe._90.megacells.definition.MEGABlocks.MEGA_CRAFTING_UNIT; diff --git a/common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderBlockItem.java b/common/src/main/java/gripe/_90/megacells/block/MEGAPatternProviderBlockItem.java similarity index 95% rename from common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderBlockItem.java rename to common/src/main/java/gripe/_90/megacells/block/MEGAPatternProviderBlockItem.java index ee71fe77..293c1351 100644 --- a/common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderBlockItem.java +++ b/common/src/main/java/gripe/_90/megacells/block/MEGAPatternProviderBlockItem.java @@ -1,4 +1,4 @@ -package gripe._90.megacells.item; +package gripe._90.megacells.block; import java.util.List; diff --git a/common/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java b/common/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java index d2577b62..d3348708 100644 --- a/common/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java +++ b/common/src/main/java/gripe/_90/megacells/definition/MEGABlocks.java @@ -26,10 +26,10 @@ import appeng.decorative.AEDecorativeBlock; import gripe._90.megacells.MEGACells; +import gripe._90.megacells.block.MEGACraftingBlockItem; import gripe._90.megacells.block.MEGACraftingUnitType; import gripe._90.megacells.block.MEGAPatternProviderBlock; -import gripe._90.megacells.item.MEGACraftingBlockItem; -import gripe._90.megacells.item.MEGAPatternProviderBlockItem; +import gripe._90.megacells.block.MEGAPatternProviderBlockItem; public final class MEGABlocks { public static void init() { diff --git a/common/src/main/java/gripe/_90/megacells/definition/MEGAItems.java b/common/src/main/java/gripe/_90/megacells/definition/MEGAItems.java index 4e04341c..d68706e3 100644 --- a/common/src/main/java/gripe/_90/megacells/definition/MEGAItems.java +++ b/common/src/main/java/gripe/_90/megacells/definition/MEGAItems.java @@ -5,14 +5,18 @@ import java.util.List; import java.util.function.Function; +import net.minecraft.Util; import net.minecraft.world.item.Item; +import appeng.api.parts.PartModels; import appeng.api.stacks.AEKeyType; import appeng.core.definitions.ItemDefinition; import appeng.items.materials.EnergyCardItem; import appeng.items.materials.MaterialItem; import appeng.items.materials.StorageComponentItem; import appeng.items.materials.UpgradeCardItem; +import appeng.items.parts.PartItem; +import appeng.items.parts.PartModelsHelper; import appeng.items.storage.BasicStorageCell; import appeng.items.storage.StorageTier; import appeng.menu.me.common.MEStorageMenu; @@ -21,6 +25,9 @@ import gripe._90.megacells.crafting.DecompressionPatternItem; import gripe._90.megacells.item.MEGABulkCell; import gripe._90.megacells.item.MEGAPortableCell; +import gripe._90.megacells.part.DecompressionModulePart; +import gripe._90.megacells.part.MEGAPatternProviderPart; +import gripe._90.megacells.part.MEGAPatternProviderPartItem; public final class MEGAItems { public static void init() { @@ -98,6 +105,19 @@ public static List> getItems() { public static final ItemDefinition DECOMPRESSION_PATTERN = item("Decompression Pattern", "decompression_pattern", DecompressionPatternItem::new); + public static final ItemDefinition MEGA_PATTERN_PROVIDER = Util.make(() -> { + PartModels.registerModels(PartModelsHelper.createModels(MEGAPatternProviderPart.class)); + return item("MEGA Pattern Provider", "cable_mega_pattern_provider", MEGAPatternProviderPartItem::new); + }); + + public static final ItemDefinition> DECOMPRESSION_MODULE = Util.make(() -> { + PartModels.registerModels(PartModelsHelper.createModels(DecompressionModulePart.class)); + return item( + "MEGA Decompression Module", + "decompression_module", + p -> new PartItem<>(p, DecompressionModulePart.class, DecompressionModulePart::new)); + }); + public static List> getItemCells() { return List.of(ITEM_CELL_1M, ITEM_CELL_4M, ITEM_CELL_16M, ITEM_CELL_64M, ITEM_CELL_256M); } diff --git a/common/src/main/java/gripe/_90/megacells/definition/MEGAParts.java b/common/src/main/java/gripe/_90/megacells/definition/MEGAParts.java deleted file mode 100644 index e758e8b2..00000000 --- a/common/src/main/java/gripe/_90/megacells/definition/MEGAParts.java +++ /dev/null @@ -1,46 +0,0 @@ -package gripe._90.megacells.definition; - -import java.util.function.Function; - -import net.minecraft.world.item.Item; - -import appeng.api.parts.IPart; -import appeng.api.parts.IPartItem; -import appeng.api.parts.PartModels; -import appeng.core.definitions.ItemDefinition; -import appeng.items.parts.PartItem; -import appeng.items.parts.PartModelsHelper; - -import gripe._90.megacells.MEGACells; -import gripe._90.megacells.item.MEGAPatternProviderPartItem; -import gripe._90.megacells.part.DecompressionModulePart; -import gripe._90.megacells.part.MEGAPatternProviderPart; - -public final class MEGAParts { - public static void init() { - // controls static load order - MEGACells.LOGGER.info("Initialised cable parts."); - } - - public static final ItemDefinition> MEGA_PATTERN_PROVIDER = customPart( - "MEGA Pattern Provider", - "cable_mega_pattern_provider", - MEGAPatternProviderPart.class, - MEGAPatternProviderPartItem::new); - public static final ItemDefinition> DECOMPRESSION_MODULE = part( - "MEGA Decompression Module", - "decompression_module", - DecompressionModulePart.class, - DecompressionModulePart::new); - - private static ItemDefinition> part( - String englishName, String id, Class partClass, Function, T> factory) { - return customPart(englishName, id, partClass, props -> new PartItem<>(props, partClass, factory)); - } - - private static ItemDefinition> customPart( - String englishName, String id, Class partClass, Function> itemFactory) { - PartModels.registerModels(PartModelsHelper.createModels(partClass)); - return MEGAItems.item(englishName, id, itemFactory); - } -} diff --git a/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPart.java b/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPart.java index a99e2af2..e4191d57 100644 --- a/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPart.java +++ b/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPart.java @@ -17,7 +17,7 @@ import gripe._90.megacells.MEGACells; import gripe._90.megacells.block.MEGAPatternProviderBlock; -import gripe._90.megacells.definition.MEGAParts; +import gripe._90.megacells.definition.MEGAItems; import gripe._90.megacells.menu.MEGAPatternProviderMenu; public class MEGAPatternProviderPart extends PatternProviderPart { @@ -65,6 +65,6 @@ public IPartModel getStaticModels() { @Override public ItemStack getMainMenuIcon() { - return MEGAParts.MEGA_PATTERN_PROVIDER.stack(); + return MEGAItems.MEGA_PATTERN_PROVIDER.stack(); } } diff --git a/common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderPartItem.java b/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPartItem.java similarity index 89% rename from common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderPartItem.java rename to common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPartItem.java index ee7f9065..21b225d2 100644 --- a/common/src/main/java/gripe/_90/megacells/item/MEGAPatternProviderPartItem.java +++ b/common/src/main/java/gripe/_90/megacells/part/MEGAPatternProviderPartItem.java @@ -1,4 +1,4 @@ -package gripe._90.megacells.item; +package gripe._90.megacells.part; import java.util.List; @@ -11,7 +11,6 @@ import appeng.items.parts.PartItem; import gripe._90.megacells.definition.MEGATranslations; -import gripe._90.megacells.part.MEGAPatternProviderPart; public class MEGAPatternProviderPartItem extends PartItem { public MEGAPatternProviderPartItem(Properties properties) { diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java b/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java index a16f3a97..42cce56c 100644 --- a/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java +++ b/fabric/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java @@ -34,7 +34,6 @@ import gripe._90.megacells.MEGACells; import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.definition.MEGATags; import gripe._90.megacells.integration.appbot.AppBotItems; import gripe._90.megacells.util.Addons; @@ -281,7 +280,7 @@ public void buildRecipes(@NotNull Consumer consumer) { .unlockedBy("has_advanced_card", has(AEItems.ADVANCED_CARD)) .unlockedBy("has_matter_ball", has(AEItems.MATTER_BALL)) .save(consumer, MEGACells.makeId("crafting/compression_card")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAParts.DECOMPRESSION_MODULE) + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAItems.DECOMPRESSION_MODULE) .pattern("IAI") .pattern("C#E") .pattern("ILI") @@ -302,13 +301,13 @@ public void buildRecipes(@NotNull Consumer consumer) { .unlockedBy("has_pattern_provider", has(ConventionTags.PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGAParts.MEGA_PATTERN_PROVIDER) + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGAItems.MEGA_PATTERN_PROVIDER) .requires(MEGABlocks.MEGA_PATTERN_PROVIDER) .unlockedBy("has_mega_pattern_provider", has(MEGABlocks.MEGA_PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider_part")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGABlocks.MEGA_PATTERN_PROVIDER) - .requires(MEGAParts.MEGA_PATTERN_PROVIDER) - .unlockedBy("has_cable_mega_pattern_provider", has(MEGAParts.MEGA_PATTERN_PROVIDER)) + .requires(MEGAItems.MEGA_PATTERN_PROVIDER) + .unlockedBy("has_cable_mega_pattern_provider", has(MEGAItems.MEGA_PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider_block")); if (MEGACells.PLATFORM.isAddonLoaded(Addons.APPBOT)) { diff --git a/fabric/src/data/java/gripe/_90/megacells/datagen/TagProvider.java b/fabric/src/data/java/gripe/_90/megacells/datagen/TagProvider.java index d8c4e719..0c58e24e 100644 --- a/fabric/src/data/java/gripe/_90/megacells/datagen/TagProvider.java +++ b/fabric/src/data/java/gripe/_90/megacells/datagen/TagProvider.java @@ -17,7 +17,6 @@ import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.definition.MEGATags; abstract class TagProvider { @@ -35,7 +34,7 @@ protected void addTags(HolderLookup.Provider provider) { .add(getKey(MEGABlocks.MEGA_ENERGY_CELL)); tag(MEGATags.MEGA_PATTERN_PROVIDER) .add(getKey(MEGABlocks.MEGA_PATTERN_PROVIDER)) - .add(getKey(MEGAParts.MEGA_PATTERN_PROVIDER)); + .add(getKey(MEGAItems.MEGA_PATTERN_PROVIDER)); } private ResourceKey getKey(ItemDefinition item) { diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java b/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java index da85a670..a28dc091 100644 --- a/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java +++ b/forge/src/data/java/gripe/_90/megacells/datagen/ModelProvider.java @@ -32,7 +32,6 @@ import gripe._90.megacells.MEGACells; import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.integration.appbot.AppBotItems; import gripe._90.megacells.integration.appmek.AppMekItems; import gripe._90.megacells.util.Addons; @@ -155,7 +154,7 @@ private void driveCell(String texture) { } private void patternProviderPart() { - withExistingParent(MEGAParts.MEGA_PATTERN_PROVIDER.id().getPath(), CABLE_INTERFACE) + withExistingParent(MEGAItems.MEGA_PATTERN_PROVIDER.id().getPath(), CABLE_INTERFACE) .texture("back", "part/mega_monitor_back") .texture("front", "part/mega_pattern_provider") .texture("sides", "part/mega_monitor_sides"); diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java b/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java index 4f737396..b4816d3d 100644 --- a/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java +++ b/forge/src/data/java/gripe/_90/megacells/datagen/RecipeProvider.java @@ -40,7 +40,6 @@ import gripe._90.megacells.MEGACells; import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.definition.MEGATags; import gripe._90.megacells.integration.appbot.AppBotItems; import gripe._90.megacells.integration.appmek.AppMekItems; @@ -288,7 +287,7 @@ protected void buildRecipes(@NotNull Consumer consumer) { .unlockedBy("has_advanced_card", has(AEItems.ADVANCED_CARD)) .unlockedBy("has_matter_ball", has(AEItems.MATTER_BALL)) .save(consumer, MEGACells.makeId("crafting/compression_card")); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAParts.DECOMPRESSION_MODULE) + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAItems.DECOMPRESSION_MODULE) .pattern("IAI") .pattern("C#E") .pattern("ILI") @@ -309,13 +308,13 @@ protected void buildRecipes(@NotNull Consumer consumer) { .unlockedBy("has_pattern_provider", has(ConventionTags.PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGAParts.MEGA_PATTERN_PROVIDER) + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGAItems.MEGA_PATTERN_PROVIDER) .requires(MEGABlocks.MEGA_PATTERN_PROVIDER) .unlockedBy("has_mega_pattern_provider", has(MEGABlocks.MEGA_PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider_part")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGABlocks.MEGA_PATTERN_PROVIDER) - .requires(MEGAParts.MEGA_PATTERN_PROVIDER) - .unlockedBy("has_cable_mega_pattern_provider", has(MEGAParts.MEGA_PATTERN_PROVIDER)) + .requires(MEGAItems.MEGA_PATTERN_PROVIDER) + .unlockedBy("has_cable_mega_pattern_provider", has(MEGAItems.MEGA_PATTERN_PROVIDER)) .save(consumer, MEGACells.makeId("network/mega_pattern_provider_block")); if (MEGACells.PLATFORM.isAddonLoaded(Addons.APPMEK)) { diff --git a/forge/src/data/java/gripe/_90/megacells/datagen/TagProvider.java b/forge/src/data/java/gripe/_90/megacells/datagen/TagProvider.java index dcff109f..8cf6318e 100644 --- a/forge/src/data/java/gripe/_90/megacells/datagen/TagProvider.java +++ b/forge/src/data/java/gripe/_90/megacells/datagen/TagProvider.java @@ -23,7 +23,6 @@ import gripe._90.megacells.MEGACells; import gripe._90.megacells.definition.MEGABlocks; import gripe._90.megacells.definition.MEGAItems; -import gripe._90.megacells.definition.MEGAParts; import gripe._90.megacells.definition.MEGATags; abstract class TagProvider { @@ -45,7 +44,7 @@ protected void addTags(@NotNull HolderLookup.Provider provider) { .add(getKey(MEGABlocks.MEGA_ENERGY_CELL)); tag(MEGATags.MEGA_PATTERN_PROVIDER) .add(getKey(MEGABlocks.MEGA_PATTERN_PROVIDER)) - .add(getKey(MEGAParts.MEGA_PATTERN_PROVIDER)); + .add(getKey(MEGAItems.MEGA_PATTERN_PROVIDER)); } private ResourceKey getKey(ItemDefinition item) {