Skip to content

Commit

Permalink
fix fabric
Browse files Browse the repository at this point in the history
  • Loading branch information
screret committed Oct 20, 2023
1 parent d28a24d commit 4f53e95
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 7 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## changelog

---
0.0.2.a:
- fix fabric


0.0.2:
- initial release
4 changes: 4 additions & 0 deletions common/src/main/java/argent_matter/gcys/GCyS.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import argent_matter.gcys.common.data.*;
import argent_matter.gcys.config.GcysConfig;
import argent_matter.gcys.data.GCySDatagen;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.lowdragmc.lowdraglib.gui.factory.UIFactory;
import net.minecraft.resources.ResourceLocation;
import org.slf4j.Logger;
Expand All @@ -17,6 +18,7 @@ public class GCyS {
public static final Logger LOGGER = LoggerFactory.getLogger(NAME);

public static void init() {
ConfigHolder.init(); // Forcefully init GT config because fabric doesn't allow dependents to load after dependencies
GcysConfig.init();
GCySNetworking.init();
UIFactory.register(EntityUIFactory.INSTANCE);
Expand All @@ -26,6 +28,8 @@ public static void init() {
GCySEntityDataSerializers.init();
GCySEntities.init();
GCySBlocks.init();
GCySRecipeTypes.init();
GCySMachines.init();
GCySItems.init();
GCySMenus.init();

Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/argent_matter/gcys/GCySGTAddon.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public void registerCovers() {

@Override
public void registerRecipeTypes() {
GCySRecipeTypes.init();

}

@Override
public void registerMachines() {
GCySMachines.init();

}

@Override
Expand Down
9 changes: 9 additions & 0 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ loom {
}
}

sourceSets {
main {
resources {
srcDir("src/generated/resources")
exclude("**/.cache")
}
}
}

configurations {
common
shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
Expand Down
3 changes: 2 additions & 1 deletion fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
],
"depends": {
"fabricloader": ">=0.14.20",
"minecraft": ">=1.19.2"
"minecraft": ">=1.19.2",
"gtceu": ">=1.0.13.b"
}
}
2 changes: 1 addition & 1 deletion forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ issueTrackerURL="https://github.com/argent-matter/gcys/issues"
[[dependencies.gcys]]
modId="gtceu"
mandatory=true
versionRange="[1.0.6,)"
versionRange="[1.0.13.b,)"
ordering="AFTER"
side="BOTH"
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M

mod_id=gcys
mod_name=Gregicality Space
mod_version=0.0.2
mod_version=0.0.2.a
maven_group=argent_matter

enabled_platforms = fabric,forge

0 comments on commit 4f53e95

Please sign in to comment.