BirDt/oc2r-low-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now supports 1.18.2

Browse source
This commit is contained in:
Robert MacRae 2025-01-31 14:44:28 -04:00
parent cc5f40a9e7
commit c439985ac2
9 changed files with 11 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build.gradle
View file

@ -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")
}

2
gradle.properties
View file

@ -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

2
minecraft.gradle
View file

@ -1,4 +1,4 @@
ext {
minecraft_version = '1.19.2'
minecraft_version = '1.18.2'
minecraft_sdk = 'forge'
}

2
src/main/java/com/therealm18studios/lc/LibreComponents.java
View file

@ -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());
}
}

26
src/main/java/com/therealm18studios/lc/common/item/ItemGroup.java
View file

@ -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()););
// }
}

20
src/main/java/com/therealm18studios/lc/data/DataGenerators.java
View file

@ -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));
}
}
}

55
src/main/java/com/therealm18studios/lc/data/ModItemModelProvider.java
View file

@ -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 <T extends Item> void simple(final RegistryObject<T> item) {
simple(item, "item/" + item.getId().getPath());
}
private <T extends Item> ItemModelBuilder simple(final RegistryObject<T> item, final String texturePath) {
return singleTexture(item.getId().getPath(),
new ResourceLocation("item/generated"),
"layer0",
new ResourceLocation(LibreComponents.MOD_ID, texturePath));
}
}

4
src/main/java/com/therealm18studios/lc/manual/Manuals.java
View file

@ -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())));
}
}

6
src/main/resources/META-INF/mods.toml
View file

@ -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]]