Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
ferriarnus committed Dec 12, 2023
1 parent 87d981b commit 4831807
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 39 deletions.
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'dev.architectury.loom' version '1.2.348'
id 'dev.architectury.loom' version '1.4-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -10,19 +10,13 @@ sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

loom {
mixin.defaultRefmapName = "nvidium.refmap.json"
runs {
it.configureEach {
vmArgs("-Xmx8G", "-XX:+UseZGC")
}
}

silentMojangMappingsLicense()
forge {
mixinConfigs = [
"nvidium.mixins.json"
]
}
}

processResources {
Expand All @@ -41,23 +35,29 @@ repositories {
includeGroup "maven.modrinth"
}
}
maven { url "https://maven.neoforged.net" }
}

dependencies {

mappings loom.layered() {
it.mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
it.mappings file("mappings/yarnpatch.tiny")
}
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
//mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
neoForge "net.neoforged:neoforge:${project.neoforge_version}"

modImplementation "maven.modrinth:embeddium:0.2.10+mc1.20.1"
modImplementation "maven.modrinth:embeddium:0.2.13+mc1.20.4"
modCompileOnly "maven.modrinth:oculus:1.20.1-1.6.9"
// Fabric API
modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))
modImplementation(fabricApi.module("fabric-block-view-api-v2", project.fabric_version))
modImplementation(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version))
//modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))
//modImplementation(fabricApi.module("fabric-block-view-api-v2", project.fabric_version))
//modImplementation(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version))

modImplementation("net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.3.40+73761d2e3b")
modImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version))
//modImplementation("net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.3.40+73761d2e3b")
//modImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version))


//modImplementation "maven.modrinth:c2me-fabric:0.2.0+alpha.10.49+1.19.4"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ maven_group=me.cortex
archives_base_name=nvidium
# Dependencies
# check this on https://modmuss50.me/fabric.html
loom.platform=forge
forge_version=47.1.3
loom.platform=neoforge
neoforge_version=20.4.4-beta
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions mappings/yarnpatch.tiny
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tiny 2 0 intermediary named
c net/minecraft/class_1927 net/minecraft/world/explosion/Explosion
m ()Lnet/minecraft/class_243; method_55109 getPositionYarn
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pluginManagement {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven { url "https://files.minecraftforge.net/maven/" }
maven { url "https://maven.neoforged.net" }
maven { url "https://maven.architectury.dev/" }
mavenCentral()
gradlePluginPortal()
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/me/cortex/nvidium/Nvidium.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import me.cortex.nvidium.config.NvidiumConfig;
import net.minecraft.util.Util;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.IExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.network.NetworkConstants;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.IExtensionPoint;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.event.lifecycle.FMLConstructModEvent;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.network.NetworkConstants;
import org.lwjgl.opengl.GL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/me/cortex/nvidium/NvidiumStub.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package me.cortex.nvidium;

import net.minecraftforge.fml.IExtensionPoint;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.network.NetworkConstants;
import net.neoforged.fml.IExtensionPoint;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.network.NetworkConstants;

@Mod("nvidium")
public class NvidiumStub {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/cortex/nvidium/config/NvidiumConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import me.cortex.nvidium.Nvidium;
import net.minecraftforge.fml.loading.FMLConfig;
import net.minecraftforge.fml.loading.FMLPaths;
import net.neoforged.fml.loading.FMLConfig;
import net.neoforged.fml.loading.FMLPaths;

import java.io.FileReader;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package me.cortex.nvidium.sodiumCompat;

import net.irisshaders.iris.api.v0.IrisApi;
import net.minecraftforge.fml.loading.FMLLoader;
import net.neoforged.fml.loading.FMLLoader;

public class IrisCheck {
public static final boolean IRIS_LOADED = FMLLoader.getLoadingModList().getModFileById("oculus") != null;
Expand Down
11 changes: 7 additions & 4 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[47,)"
loaderVersion="[1,)"
license="LGPL-3.0"
[[mods]]
modId="acedium"
Expand All @@ -13,16 +13,16 @@ Replacement rendering engine for sodium/embeddium
'''

[[dependencies.acedium]]
modId = "forge"
modId = "neoforge"
mandatory = true
versionRange = "[46,)"
versionRange = "[20.3.0-beta,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.acedium]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20,1.20.1]"
versionRange = "[1.20.3,1.20.5)"
ordering = "NONE"
side = "BOTH"

Expand All @@ -33,6 +33,9 @@ versionRange = "[0.2.2+mc1.20.1, )"
ordering = "NONE"
side = "CLIENT"

[[mixins]]
config = "nvidium.mixins.json"

[[mods]]
modId="nvidium"
displayName="Nvidium (Acedium)"
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/nvidium.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
"injectors": {
"defaultRequire": 1
},
"minVersion": "0.8.4"
"minVersion": "0.8.4",
"refmap": "nvidium.refmap.json"
}

0 comments on commit 4831807

Please sign in to comment.