From 49c3652d78918110b2e4cbdffca9ab2680aa38c1 Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:47:04 -0400 Subject: [PATCH] CLean-up of code --- .../therealm18studios/lc/LibreComponents.java | 3 - .../lc/common/item/ItemGroup.java | 26 --------- .../lc/data/DataGenerators.java | 20 ------- .../lc/data/ModItemModelProvider.java | 55 ------------------- 4 files changed, 104 deletions(-) delete mode 100644 src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java delete mode 100644 src/main/java/com/therealm18studios/lc/data/DataGenerators.java delete mode 100644 src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java index 01669f1..5622b98 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -1,13 +1,11 @@ package com.therealm18studios.lc; -import com.therealm18studios.lc.common.item.ItemGroup; import com.therealm18studios.lc.common.item.Items; import com.therealm18studios.lc.manual.Manuals; import li.cil.oc2.common.ConfigManager; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @Mod("librecomponents") public final class LibreComponents { @@ -20,6 +18,5 @@ public final class LibreComponents { Items.initialize(); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize); -// ItemGroup.COMMON.register(FMLJavaModLoadingContext.get().getModEventBus()); } } diff --git a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java deleted file mode 100644 index 6ce5e39..0000000 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.therealm18studios.lc.common.item; - -import com.therealm18studios.lc.LibreComponents; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.ItemStack; - -public final class ItemGroup { - public static final CreativeModeTab COMMON = new CreativeModeTab(LibreComponents.MOD_ID + ".common") - { - @Override - public ItemStack makeIcon() { - return new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()); - } - }; - -// public ItemGroup getInstance(ItemGroup){ -// ItemGroup.TAB_REGISTER.getDisplayName().contains( -// Items.MEMORY_SMALL.get(), Items.MEMORY_MEDIUM.get(), Items.MEMORY_LARGE.get(), Items.MEMORY_EXTRA_LARGE.get(), -// Items.HARD_DRIVE_SMALL.get(), Items.HARD_DRIVE_MEDIUM.get(), Items.HARD_DRIVE_LARGE.get(), Items.HARD_DRIVE_EXTRA_LARGE.get(), -// Items.FLOPPY.get(), Items.FLOPPY_MODERN.get()) -// output.accept(Items.CPU_TIER_1.get()); -// output.accept(Items.CPU_TIER_2.get()); -// output.accept(Items.CPU_TIER_3.get()); -// output.accept(Items.CPU_TIER_4.get());); -// } -} diff --git a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java deleted file mode 100644 index 5377821..0000000 --- a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.therealm18studios.lc.data; - -import net.minecraft.data.DataGenerator; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public final class DataGenerators { - @SubscribeEvent - public static void gatherData(final GatherDataEvent event) { - final DataGenerator generator = event.getGenerator(); - final ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - - if (event.includeClient()) { - generator.addProvider(true, new ModItemModelProvider(generator, existingFileHelper)); - } - } -} diff --git a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java deleted file mode 100644 index 3e3865e..0000000 --- a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.therealm18studios.lc.data; - -import com.therealm18studios.lc.LibreComponents; -import li.cil.oc2.common.entity.Entities; -import com.therealm18studios.lc.common.item.Items; -import net.minecraft.data.DataGenerator; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.RegistryObject; - -public final class ModItemModelProvider extends ItemModelProvider { - public ModItemModelProvider(final DataGenerator generator, final ExistingFileHelper existingFileHelper) { - super(generator, LibreComponents.MOD_ID, existingFileHelper); - } - - @Override - protected void registerModels() { - simple(Items.MEMORY_SMALL); - simple(Items.MEMORY_MEDIUM); - simple(Items.MEMORY_LARGE); - simple(Items.MEMORY_EXTRA_LARGE); -// simple(Items.CPU_TIER_1); -// simple(Items.CPU_TIER_2); -// simple(Items.CPU_TIER_3); -// simple(Items.CPU_TIER_4); - simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); - simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); - simple(Items.HARD_DRIVE_LARGE, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); - simple(Items.HARD_DRIVE_EXTRA_LARGE, "item/hard_drive_base") - .texture("layer1", "item/hard_drive_tint"); - simple(Items.FLOPPY, "item/floppy_base") - .texture("layer1", "item/floppy_tint"); - simple(Items.FLOPPY_MODERN, "item/floppy_base") - .texture("layer1", "item/floppy_tint"); - - withExistingParent(Entities.ROBOT.getId().getPath(), "template_shulker_box"); - } - - private void simple(final RegistryObject item) { - simple(item, "item/" + item.getId().getPath()); - } - - private ItemModelBuilder simple(final RegistryObject item, final String texturePath) { - return singleTexture(item.getId().getPath(), - new ResourceLocation("item/generated"), - "layer0", - new ResourceLocation(LibreComponents.MOD_ID, texturePath)); - } -}