Skip to content

Commit

Permalink
Rebrand to Vintagium & fix actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Asek3 committed Jan 24, 2024
1 parent a1aa194 commit e43a4ae
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: 17
java-version: 8
- name: Build artifacts
run: ./gradlew build publishMods -Pbuild.release=true
- name: Upload assets to GitHub
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '8'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build the mod
run: ./gradlew --no-daemon build
- uses: actions/upload-artifact@v2
with:
name: Embeddium
path: bin
name: Vintagium
path: build/libs
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ minecraft {
username.set("Developer")

injectedTags.put("MOD_VERSION", mod_version)
injectedTags.put("MOD_NAME", "Sodium-Vintage")
injectedTags.put("MOD_NAME", "Vintagium")
}

tasks.injectTags.outputClassName.set("${mod_base_package}.Tags")

tasks.deobfuscateMergedJarToSrg.configure {accessTransformerFiles.from("src/main/resources/META-INF/sodium_at.cfg")}
tasks.deobfuscateMergedJarToSrg.configure {accessTransformerFiles.from("src/main/resources/META-INF/vintagium_at.cfg")}

repositories {
maven { url "https://maven.cleanroommc.com" }
Expand All @@ -39,7 +39,7 @@ repositories {
}

dependencies {
def mixinBooter = modUtils.enableMixins("zone.rong:mixinbooter:8.9", "sodium.mixins.refmap.json")
def mixinBooter = modUtils.enableMixins("zone.rong:mixinbooter:8.9", "vintagium.mixins.refmap.json")
api (mixinBooter) {
transitive = false
}
Expand Down Expand Up @@ -70,7 +70,7 @@ jar {
"FMLCorePlugin": "me.jellysquid.mods.sodium.client.SodiumMixinTweaker",
"FMLCorePluginContainsFMLMod": true,
"ForceLoadAsMod": true,
"FMLAT": "sodium_at.cfg"
"FMLAT": "vintagium_at.cfg"
)
}
}
Expand Down
9 changes: 4 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ loader_version_range=[23,)
mappings_channel=stable
mappings_version=39-1.12

mod_id=sodium
mod_name=Sodium
mod_id=vintagium
mod_name=Vintagium
mod_main_class=SodiumClientMod
mod_version=1.0
mod_version=0.1
mod_base_package=me.jellysquid.mods.sodium
mod_authors=JellySquid, Asek3
mod_description=Example mod description\nNewline characters can be used and will be replaced properly
mod_description=Vintagium is a fork of Sodium, which is a free and open-source \noptimization mod for Minecraft which improves frame rates and reduces lag spikes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@

import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
import net.minecraft.client.Minecraft;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

@Mod(modid = SodiumClientMod.MODID, name = "Sodium", version = SodiumClientMod.MOD_VERSION)
@Mod(modid = SodiumClientMod.MODID, useMetadata = true)
public class SodiumClientMod {
private static SodiumGameOptions CONFIG;
public static Logger LOGGER = LogManager.getLogger("Sodium");

public static final String MOD_VERSION = "1.0";
public static final String MODID = "vintagium";
public static final String MODNAME = "Vintagium";
public static final String MOD_VERSION = Loader.instance().getIndexedModList().get(MODID).getVersion();

public static final String MODID = "sodium";
private static SodiumGameOptions CONFIG;
public static Logger LOGGER = LogManager.getLogger(MODNAME);

public static SodiumGameOptions options() {
if (CONFIG == null) {
Expand All @@ -25,14 +27,14 @@ public static SodiumGameOptions options() {

public static Logger logger() {
if (LOGGER == null) {
LOGGER = LogManager.getLogger("Sodium");
LOGGER = LogManager.getLogger(MODNAME);
}

return LOGGER;
}

private static SodiumGameOptions loadConfig() {
return SodiumGameOptions.load(Minecraft.getMinecraft().gameDir.toPath().resolve("config").resolve("sodium-options.json"));
return SodiumGameOptions.load(Minecraft.getMinecraft().gameDir.toPath().resolve("config").resolve(MODID + "-options.json"));
}

public static String getVersion() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
public class SodiumMixinTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader {
@Override
public List<String> getMixinConfigs() {
return ImmutableList.of("sodium.mixins.json");
return ImmutableList.of(SodiumClientMod.MODID + ".mixins.json");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ public void save() {
throw new RuntimeException("Couldn't save configuration changes", e);
}

SodiumClientMod.logger().info("Flushed changes to Sodium configuration");
SodiumClientMod.logger().info("Flushed changes to " + SodiumClientMod.MODNAME + " configuration");
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.jellysquid.mods.sodium.common.config;

import me.jellysquid.mods.sodium.client.SodiumClientMod;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -15,7 +16,7 @@
* Documentation of these options: https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File
*/
public class SodiumConfig {
private static final Logger LOGGER = LogManager.getLogger("EmbeddiumConfig");
private static final Logger LOGGER = LogManager.getLogger(SodiumClientMod.MODNAME + "Config");

private static final String JSON_KEY_SODIUM_OPTIONS = "sodium:options";

Expand Down Expand Up @@ -182,7 +183,7 @@ private static void writeDefaultConfig(File file) throws IOException {
}

try (Writer writer = new FileWriter(file)) {
writer.write("# This is the configuration file for Sodium.\n");
writer.write("# This is the configuration file for " + SodiumClientMod.MODNAME + ".\n");
writer.write("#\n");
writer.write("# You can find information on editing this file and all the available options here:\n");
writer.write("# https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File\n");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package me.jellysquid.mods.sodium.mixin;

import me.jellysquid.mods.sodium.client.SodiumClientMod;
import me.jellysquid.mods.sodium.common.config.Option;
import me.jellysquid.mods.sodium.common.config.SodiumConfig;

Expand All @@ -16,18 +17,18 @@
public class SodiumMixinPlugin implements IMixinConfigPlugin {
private static final String MIXIN_PACKAGE_ROOT = "me.jellysquid.mods.sodium.mixin.";

private final Logger logger = LogManager.getLogger("Sodium");
private final Logger logger = LogManager.getLogger(SodiumClientMod.MODNAME);
private SodiumConfig config;

@Override
public void onLoad(String mixinPackage) {
try {
this.config = SodiumConfig.load(new File(".").toPath().resolve("config").resolve("sodium-mixins.properties").toFile());
this.config = SodiumConfig.load(new File(".").toPath().resolve("config").resolve(SodiumClientMod.MODID + "-mixins.properties").toFile());
} catch (Exception e) {
throw new RuntimeException("Could not load configuration file for Sodium", e);
throw new RuntimeException("Could not load configuration file for " + SodiumClientMod.MODNAME, e);
}

this.logger.info("Loaded configuration file for Sodium: {} options available, {} override(s) found",
this.logger.info("Loaded configuration file for " + SodiumClientMod.MODNAME + ": {} options available, {} override(s) found",
this.config.getOptionCount(), this.config.getOptionOverrideCount());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private static long bytesToMb(long bytes) {
private ArrayList<String> redirectRightTextEarly(Object[] elements) {
ArrayList<String> strings = Lists.newArrayList((String[]) elements);
strings.add("");
strings.add("Sodium Renderer");
strings.add(SodiumClientMod.MODNAME + " Renderer");
strings.add(TextFormatting.UNDERLINE + getFormattedVersionText());
strings.add("");
strings.addAll(getChunkRendererDebugStrings());
Expand Down Expand Up @@ -70,7 +70,7 @@ private static List<String> getChunkRendererDebugStrings() {

List<String> strings = new ArrayList<>(5);
strings.add("Chunk Renderer: " + backend.getRendererName());
strings.add("Block Renderer: " + "Sodium");
strings.add("Block Renderer: " + SodiumClientMod.MODNAME);
strings.addAll(backend.getDebugStrings());

return strings;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"description": "mod_id resources",
"description": "Vintagium resources",
"pack_format": 3
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"minVersion": "0.8",
"compatibilityLevel": "JAVA_8",
"plugin": "me.jellysquid.mods.sodium.mixin.SodiumMixinPlugin",
"refmap": "sodium.mixins.refmap.json",
"refmap": "vintagium.mixins.refmap.json",
"injectors": {
"defaultRequire": 1
},
Expand Down

0 comments on commit e43a4ae

Please sign in to comment.