From c439985ac2ea85e620ffc32afb893402304161ff Mon Sep 17 00:00:00 2001 From: Robert MacRae Date: Fri, 31 Jan 2025 14:44:28 -0400 Subject: [PATCH] Now supports 1.18.2 --- build.gradle | 9 ++- gradle.properties | 2 +- minecraft.gradle | 2 +- .../therealm18studios/lc/LibreComponents.java | 2 - .../lc/common/item/ItemGroup.java | 26 --------- .../lc/data/DataGenerators.java | 20 ------- .../lc/data/ModItemModelProvider.java | 55 ------------------- .../therealm18studios/lc/manual/Manuals.java | 4 +- src/main/resources/META-INF/mods.toml | 6 +- 9 files changed, 11 insertions(+), 115 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/build.gradle b/build.gradle index 2042eff..0c31e2a 100644 --- a/build.gradle +++ b/build.gradle @@ -84,12 +84,11 @@ dependencies { annotationProcessor "org.spongepowered:mixin:0.8.5:processor" 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("curse.maven:architectury-api-419699:3669448") + implementation fg.deobf("curse.maven:markdownmanual-502485:3738124") + runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.7.0.180") - implementation fg.deobf("curse.maven:markdownmanual-502485:4306669") - implementation fg.deobf("curse.maven:libre-computers-1163239:6136998") + implementation fg.deobf("curse.maven:libre-computers-1163239:6137004") } diff --git a/gradle.properties b/gradle.properties index 432c5c2..92bfe47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -forge_version=43.2.10 +forge_version=40.0.40 semver=1.1.1 diff --git a/minecraft.gradle b/minecraft.gradle index a4a49e1..03af559 100644 --- a/minecraft.gradle +++ b/minecraft.gradle @@ -1,4 +1,4 @@ ext { - minecraft_version = '1.19.2' + minecraft_version = '1.18.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 01669f1..0bf6585 100644 --- a/src/main/java/com/therealm18studios/lc/LibreComponents.java +++ b/src/main/java/com/therealm18studios/lc/LibreComponents.java @@ -1,6 +1,5 @@ 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; @@ -20,6 +19,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)); - } -} diff --git a/src/main/java/com/therealm18studios/lc/manual/Manuals.java b/src/main/java/com/therealm18studios/lc/manual/Manuals.java index 9111fea..54c36ad 100644 --- a/src/main/java/com/therealm18studios/lc/manual/Manuals.java +++ b/src/main/java/com/therealm18studios/lc/manual/Manuals.java @@ -6,7 +6,7 @@ import li.cil.manual.api.ManualModel; import li.cil.manual.api.Tab; import li.cil.manual.api.prefab.tab.ItemStackTab; import li.cil.manual.api.util.Constants; -import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -25,7 +25,7 @@ public final class Manuals { TABS.register("librecomponents", () -> new ItemStackTab( ManualModel.LANGUAGE_KEY + "/librecomponents/index.md", - Component.translatable("manual." + LibreComponents.MOD_ID + ".items"), + new TranslatableComponent("manual." + LibreComponents.MOD_ID + ".items"), new ItemStack(Items.HARD_DRIVE_EXTRA_LARGE.get()))); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3df0f8b..2a547fc 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[43,)" +loaderVersion = "[40,)" issueTrackerURL = "https://github.com/Libre-Computers/LibreComponents/issues" license = "MIT" @@ -15,13 +15,13 @@ Libre Drives all the extra components you need. [[dependencies.librecomponents]] modId = "forge" mandatory = true -versionRange = "[40.1.68,)" +versionRange = "[40.0.40,)" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]] modId = "minecraft" mandatory = true -versionRange = "1.19.2" +versionRange = "1.18.2" ordering = "NONE" side = "BOTH" [[dependencies.librecomponents]]