Skip to content

Commit

Permalink
Forge now compiles, temporarily disabling Quilt
Browse files Browse the repository at this point in the history
  • Loading branch information
StellaraUmbrix committed Aug 10, 2024
1 parent e33ded9 commit fea64ad
Show file tree
Hide file tree
Showing 22 changed files with 121 additions and 65 deletions.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.thepandaparade.create_automative;

import com.google.common.base.Suppliers;
//import com.google.common.base.Suppliers;
import dev.architectury.registry.CreativeTabRegistry;
import dev.architectury.registry.registries.DeferredRegister;
import dev.architectury.registry.registries.RegistrarManager;
//import dev.architectury.registry.registries.RegistrarManager;
import dev.architectury.registry.registries.RegistrySupplier;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;

import java.util.function.Supplier;
//import java.util.function.Supplier;

public final class CreateAutomative {
public static final String MOD_ID = "create_automative";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"textures": {
"0": "create_automative:item/mould",
"particle": "item/mould"
"particle": "create_automative:item/mould"
},
"elements": [
{
Expand Down
5 changes: 3 additions & 2 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
],
"contact": {
"homepage": "https://github.com/ThePandaParade/CreateAutomative",
"sources": "https://github.com/ThePandaParade/CreateAutomative"
"sources": "https://github.com/ThePandaParade/CreateAutomative",
"issues": "https://github.com/ThePandaParade/CreateAutomative/issues"
},
"license": "LGPL-2.1 License",
"icon": "assets/create_automative/icon.png",
Expand All @@ -29,6 +30,6 @@
"fabric": "*",
"minecraft": ">=1.20.1",
"architectury": ">=9.1.12",
"create": ">=0.4.2"
"create": ">=0.4.0"
}
}
39 changes: 36 additions & 3 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,33 @@ architectury {
forge()
}

repositories {
mavenLocal()
maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI
maven { url = "https://maven.blamejared.com/" } // JEI
maven { url = "https://maven.parchmentmc.org" } // Parchment mappings
maven { url = "https://maven.quiltmc.org/repository/release" } // Quilt Mappings
maven { url = "https://api.modrinth.com/maven" } // LazyDFU, JEI runtime
maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu
maven { url = "https://mvn.devos.one/snapshots/" } // Create, Porting Lib, Forge Tags, Milk Lib, Registrate
maven { url = "https://cursemaven.com" } // Forge Config API Port
maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
maven { url = "https://jitpack.io/" } // Mixin Extras, Fabric ASM
maven { url = "https://maven.tterrag.com/" } // Flywheel
// Borrowed from Antarctic Gardens' Create New Age. Sorry!
maven { url = "https://squiddev.cc/maven/"}
maven { url = "https://maven.resourcefulbees.com/repository/maven-public/"}
}

loom {
accessWidenerPath = project(":common").loom.accessWidenerPath

forge {
convertAccessWideners = true
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name

mixinConfig "examplemod-common.mixins.json"
mixinConfig "examplemod.mixins.json"
mixinConfig "create_automative-common.mixins.json"
mixinConfig "create_automative.mixins.json"
}
}

Expand All @@ -27,12 +45,27 @@ configurations {
developmentForge.extendsFrom common
}



dependencies {
forge "net.minecraftforge:forge:${rootProject.forge_version}"
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"


modImplementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim")
modCompileOnly("dev.emi:emi-forge:${emi_version}");
// compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
// compileOnly("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}");

switch (recipe_viewer.toLowerCase(Locale.ROOT)) {
case "jei": modLocalRuntime("maven.modrinth:jei:${jei_runtime}"); break
case "rei": modLocalRuntime("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}"); break
case "emi": modLocalRuntime("dev.emi:emi-forge:${emi_version}"); break
case "disabled": break
default: println("Unknown recipe viewer specified: ${recipe_viewer}. Must be JEI, REI, EMI, or disabled.")
}


common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
Expand Down
7 changes: 6 additions & 1 deletion forge/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
loom.platform=forge
loom.platform=forge
create_version = 0.5.1.e-22
emi_version = 1.1.11+1.20.1
jei_version = 15.11.2.44
rei_version = 12.1.740
recipe_viewer = rei
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.create_automative.forge;

import com.thepandaparade.create_automative.CreateAutomative;

import dev.architectury.platform.forge.EventBuses;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

@Mod(CreateAutomative.MOD_ID)
public class CreateAutomativeForge {
public CreateAutomativeForge() {
// Submit our event bus to let architectury register our content on the right time
EventBuses.registerModEventBus(CreateAutomative.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus());
CreateAutomative.init();
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package net.examplemod.forge;
package com.create_automative.forge;

import net.examplemod.ExampleExpectPlatform;
import net.minecraftforge.fml.loading.FMLPaths;

import java.nio.file.Path;

public class ExampleExpectPlatformImpl {
import com.thepandaparade.create_automative.TPPCAExpectPlatform;

public class TPPCAForgePlatformImpl {
/**
* This is our actual method to {@link ExampleExpectPlatform#getConfigDirectory()}.
*/
Expand Down
15 changes: 0 additions & 15 deletions forge/src/main/java/net/examplemod/forge/ExampleModForge.java

This file was deleted.

27 changes: 17 additions & 10 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,35 +1,42 @@
modLoader = "javafml"
loaderVersion = "[47,)"
#issueTrackerURL = ""
license = "Insert License Here"
issueTrackerURL = "https://github.com/ThePandaParade/CreateAutomative/issues"
license = "GPL-v2.1 License"

[[mods]]
modId = "examplemod"
modId = "create_automative"
version = "${version}"
displayName = "Example Mod"
authors = "Me!"
displayName = "Create: Automative"
authors = "Robyn-Dawn 'ThePandaParade' B. <[email protected]>"
description = '''
This is an example description! Tell everyone what your mod is about!
Automate everything with Create!
'''
#logoFile = ""
logoFile = "assets/icon.png"

[[dependencies.examplemod]]
[[dependencies.create_automative]]
modId = "forge"
mandatory = true
versionRange = "[47,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.examplemod]]
[[dependencies.create_automative]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.1,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.examplemod]]
[[dependencies.create_automative]]
modId = "architectury"
mandatory = true
versionRange = "[9.1.12,)"
ordering = "AFTER"
side = "BOTH"

[[dependencies.create_automative]]
modId = "create"
mandatory = true
versionRange = "[0.4.0,)"
ordering = "AFTER"
side = "BOTH"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"required": true,
"package": "net.examplemod.mixin.fabric",
"package": "com.create_automative.mixin.forge",
"compatibilityLevel": "JAVA_17",
"minVersion": "0.8",
"client": [
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"description": "Example Mod",
"description": "Create Automative Recipes",
"pack_format": 15
}
}
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
org.gradle.jvmargs=-Xmx25G

minecraft_version=1.20.1
enabled_platforms=quilt,fabric,forge
# enabled_platforms=quilt,fabric,forge
# For now, only build Fabric and Forge.
enabled_platforms=fabric,forge

archives_base_name=createautomative
mod_version=0.1.0-INDEV
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package net.examplemod.fabric;
package com.create_automative.fabric;

import net.examplemod.ExampleExpectPlatform;
import org.quiltmc.loader.api.QuiltLoader;

import com.thepandaparade.create_automative.TPPCAExpectPlatform;

import java.nio.file.Path;

public class ExampleExpectPlatformImpl {
public class TPPCAQuiltPlatformImpl {
/**
* This is our actual method to {@link ExampleExpectPlatform#getConfigDirectory()}.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.create_automative.quilt;

import org.quiltmc.loader.api.ModContainer;
import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;

import com.thepandaparade.create_automative.CreateAutomative;

public class CreateAutomativeQuilt implements ModInitializer {
@Override
public void onInitialize(ModContainer mod) {
CreateAutomative.init();
}
}
12 changes: 0 additions & 12 deletions quilt/src/main/java/net/examplemod/quilt/ExampleModQuilt.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"required": true,
"package": "net.examplemod.mixin.forge",
"package": "com.create_automative.mixin.fabric",
"compatibilityLevel": "JAVA_17",
"minVersion": "0.8",
"client": [
Expand Down
20 changes: 12 additions & 8 deletions quilt/src/main/resources/quilt.mod.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"schema_version": 1,
"mixin": [
"examplemod.mixins.json",
"examplemod-common.mixins.json"
"create_automative.mixins.json",
"create_automative-common.mixins.json"
],
"quilt_loader": {
"group": "${group}",
"id": "examplemod",
"id": "create_automative",
"version": "${version}",
"metadata": {
"name": "Example Mod",
"description": "This is an example description! Tell everyone what your mod is about!",
"name": "Create: Automative",
"description": "Automate everything with Create!",
"contributors": {
"Me!": "Owner"
"Robyn-Dawn 'ThePandaParade' B. <[email protected]>": "Lead Developer"
},
"contact": {
"sources": "https://github.com/architectury/architectury-templates"
},
"icon": "assets/examplemod/icon.png"
"icon": "assets/icon.png"
},
"intermediate_mappings": "net.fabricmc:intermediary",
"entrypoints": {
"init": [
"net.examplemod.quilt.ExampleModQuilt"
"net.create_automative.quilt.CreateAutomativeQuilt"
]
},
"depends": [
Expand All @@ -41,6 +41,10 @@
{
"id": "architectury",
"version": ">=9.1.12"
},
{
"id": "create",
"version": ">=0.5.0"
}
]
},
Expand Down

0 comments on commit fea64ad

Please sign in to comment.