From cc5f40a9e7046ffaab4b2513b47520fb0ead556b Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:09:40 -0400 Subject: [PATCH 1/2] Project now supports 1.19.2 --- build.gradle | 19 ++++++-- gradle.properties | 12 +---- minecraft.gradle | 2 +- .../therealm18studios/lc/LibreComponents.java | 2 +- .../lc/common/item/ItemGroup.java | 48 +++++++------------ .../lc/common/item/Items.java | 18 +++---- .../lc/data/DataGenerators.java | 5 +- .../lc/data/ModItemModelProvider.java | 14 +++--- src/main/resources/META-INF/mods.toml | 4 +- .../data/librecomponents/recipes/floppy.json | 2 +- .../recipes/hard_drive_small.json | 5 +- .../librecomponents/recipes/memory_small.json | 5 +- 12 files changed, 62 insertions(+), 74 deletions(-) diff --git a/build.gradle b/build.gradle index 81e2a19..2042eff 100644 --- a/build.gradle +++ b/build.gradle @@ -71,18 +71,27 @@ repositories { } } } + flatDir { + dirs 'libs' + } + } dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" + + annotationProcessor "org.spongepowered:mixin:0.8.5:processor" - implementation fg.deobf("curse.maven:markdownmanual-502485:4873115") - implementation fg.deobf("curse.maven:architectury-api-419699:5137938") - implementation fg.deobf("curse.maven:libre-computers-1163239:6126363") + runtimeOnly fileTree(dir: 'libs', include: '*.jar') + runtimeOnly fg.deobf("curse.maven:architectury-api-419699:5137942") + runtimeOnly fg.deobf("curse.maven:jei-238222:5846858") + runtimeOnly fg.deobf("curse.maven:tiny-redstone-453746:5318126") - runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.3.0.4") -} + implementation fg.deobf("curse.maven:markdownmanual-502485:4306669") + implementation fg.deobf("curse.maven:libre-computers-1163239:6136998") + + } System.setProperty("line.separator", "\n") diff --git a/gradle.properties b/gradle.properties index 8edece0..432c5c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,18 +3,8 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -forge_version=47.2.32 +forge_version=43.2.10 semver=1.1.1 # curse_project_id=1037738 - -pr_version=4.19.0-beta+3 -ccl_version=4.4.0.+ -cbm_version=3.3.0.+ - -debug_embeddium=false - -debug_embeddium_plus_plus=false - -debug_oculus=false diff --git a/minecraft.gradle b/minecraft.gradle index 073b468..a4a49e1 100644 --- a/minecraft.gradle +++ b/minecraft.gradle @@ -1,4 +1,4 @@ ext { - minecraft_version = '1.20.1' + minecraft_version = '1.19.2' minecraft_sdk = 'forge' } diff --git a/src/main/java/com/therealm18studios/lc/LibreComponents.java b/src/main/java/com/therealm18studios/lc/LibreComponents.java index 2b8bd7b..01669f1 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -20,6 +20,6 @@ public final class LibreComponents { Items.initialize(); DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> Manuals::initialize); - ItemGroup.TAB_REGISTER.register(FMLJavaModLoadingContext.get().getModEventBus()); +// 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 index c200f08..6ce5e39 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java +++ b/src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java @@ -1,40 +1,26 @@ package com.therealm18studios.lc.common.item; import com.therealm18studios.lc.LibreComponents; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.RegistryObject; public final class ItemGroup { - public static final DeferredRegister TAB_REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, LibreComponents.MOD_ID); + public static final CreativeModeTab COMMON = new CreativeModeTab(LibreComponents.MOD_ID + ".common") + { + @Override + public ItemStack makeIcon() { + return new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()); + } + }; - @SuppressWarnings("unused") - public static final RegistryObject COMMON_TAB = TAB_REGISTER.register("common", () -> CreativeModeTab.builder() - // Set name of tab to display - .title(Component.translatable("item_group." + LibreComponents.MOD_ID + ".common")) - // Set icon of creative tab - .icon(() -> new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get())) - // Add default items to tab - .displayItems((params, output) -> { - // Items - output.accept(Items.MEMORY_SMALL.get()); - output.accept(Items.MEMORY_MEDIUM.get()); - output.accept(Items.MEMORY_LARGE.get()); - output.accept(Items.MEMORY_EXTRA_LARGE.get()); - output.accept(Items.HARD_DRIVE_SMALL.get()); - output.accept(Items.HARD_DRIVE_MEDIUM.get()); - output.accept(Items.HARD_DRIVE_LARGE.get()); - output.accept(Items.HARD_DRIVE_EXTRA_LARGE.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()); - output.accept(Items.FLOPPY.get()); - output.accept(Items.FLOPPY_MODERN.get()); - }) - .build() - ); +// 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/common/item/Items.java b/src/main/java/com/therealm18studios/lc/common/item/Items.java index 148083e..c5aef4f 100644 --- a/src/main/java/com/therealm18studios/lc/common/item/Items.java +++ b/src/main/java/com/therealm18studios/lc/common/item/Items.java @@ -3,7 +3,7 @@ package com.therealm18studios.lc.common.item; import com.therealm18studios.lc.LibreComponents; import li.cil.oc2.common.item.MemoryItem; import li.cil.oc2.common.item.HardDriveItem; -import li.cil.oc2.common.item.CPUItem; +//import li.cil.oc2.common.item.CPUItem; import li.cil.oc2.common.item.FloppyItem; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; @@ -39,14 +39,14 @@ public final class Items { public static final RegistryObject HARD_DRIVE_EXTRA_LARGE = register("hard_drive_extra_large", () -> new HardDriveItem(268435456, DyeColor.YELLOW)); - public static final RegistryObject CPU_TIER_1 = register("cpu_tier_1", () -> - new CPUItem(250000000)); - public static final RegistryObject CPU_TIER_2 = register("cpu_tier_2", () -> - new CPUItem(300000000)); - public static final RegistryObject CPU_TIER_3 = register("cpu_tier_3", () -> - new CPUItem(350000000)); - public static final RegistryObject CPU_TIER_4 = register("cpu_tier_4", () -> - new CPUItem(400000000)); +// public static final RegistryObject CPU_TIER_1 = register("cpu_tier_1", () -> +// new CPUItem(250000000)); +// public static final RegistryObject CPU_TIER_2 = register("cpu_tier_2", () -> +// new CPUItem(300000000)); +// public static final RegistryObject CPU_TIER_3 = register("cpu_tier_3", () -> +// new CPUItem(350000000)); +// public static final RegistryObject CPU_TIER_4 = register("cpu_tier_4", () -> +// new CPUItem(400000000)); public static final RegistryObject FLOPPY = register("floppy", () -> new FloppyItem(2949120)); diff --git a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java index 6ce01db..5377821 100644 --- a/src/main/java/com/therealm18studios/lc/data/DataGenerators.java +++ b/src/main/java/com/therealm18studios/lc/data/DataGenerators.java @@ -1,7 +1,6 @@ package com.therealm18studios.lc.data; import net.minecraft.data.DataGenerator; -import net.minecraft.data.DataProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -14,6 +13,8 @@ public final class DataGenerators { final DataGenerator generator = event.getGenerator(); final ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - generator.addProvider(event.includeClient(), new ModItemModelProvider(generator.getPackOutput(), existingFileHelper)); + 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 index 124e18a..3e3865e 100644 --- a/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java +++ b/src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java @@ -3,7 +3,7 @@ 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.PackOutput; +import net.minecraft.data.DataGenerator; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraftforge.client.model.generators.ItemModelBuilder; @@ -12,8 +12,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.RegistryObject; public final class ModItemModelProvider extends ItemModelProvider { - public ModItemModelProvider(final PackOutput output, final ExistingFileHelper existingFileHelper) { - super(output, LibreComponents.MOD_ID, existingFileHelper); + public ModItemModelProvider(final DataGenerator generator, final ExistingFileHelper existingFileHelper) { + super(generator, LibreComponents.MOD_ID, existingFileHelper); } @Override @@ -22,10 +22,10 @@ public final class ModItemModelProvider extends ItemModelProvider { 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.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") diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f7086cc..3df0f8b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[47,)" +loaderVersion = "[43,)" issueTrackerURL = "https://github.com/Libre-Computers/LibreComponents/issues" license = "MIT" @@ -21,7 +21,7 @@ side = "BOTH" [[dependencies.librecomponents]] modId = "minecraft" mandatory = true -versionRange = "1.20.1" +versionRange = "1.19.2" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] diff --git a/src/main/resources/data/librecomponents/recipes/floppy.json b/src/main/resources/data/librecomponents/recipes/floppy.json index 6082b2f..fcc5625 100644 --- a/src/main/resources/data/librecomponents/recipes/floppy.json +++ b/src/main/resources/data/librecomponents/recipes/floppy.json @@ -6,7 +6,7 @@ ], "key": { "I": { - "item": "oc2:floppy_modern" + "item": "oc2:floppy" }, "T": { "item": "oc2:transistor" diff --git a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json index 1268375..a1446aa 100644 --- a/src/main/resources/data/librecomponents/recipes/hard_drive_small.json +++ b/src/main/resources/data/librecomponents/recipes/hard_drive_small.json @@ -2,11 +2,12 @@ "type": "minecraft:crafting_shaped", "pattern": [ "ITI", - "EBE" + "EBE", + "ITI" ], "key": { "I": { - "item": "oc2:hard_drive_extra_large" + "item": "oc2:hard_drive_large" }, "T": { "item": "oc2:transistor" diff --git a/src/main/resources/data/librecomponents/recipes/memory_small.json b/src/main/resources/data/librecomponents/recipes/memory_small.json index 75cc02a..f3a507e 100644 --- a/src/main/resources/data/librecomponents/recipes/memory_small.json +++ b/src/main/resources/data/librecomponents/recipes/memory_small.json @@ -2,11 +2,12 @@ "type": "minecraft:crafting_shaped", "pattern": [ "ITI", - " B " + " B ", + "ITI" ], "key": { "I": { - "item": "oc2:memory_extra_large" + "item": "oc2:memory_large" }, "T": { "item": "oc2:transistor" From 49c3652d78918110b2e4cbdffca9ab2680aa38c1 Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:47:04 -0400 Subject: [PATCH 2/2] 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)); - } -}