new: FRAPI-based rendering and the largest refactor you've ever seen

Sorry, not sorry.
CaffeineMC · Sep 3, 2021 · 22d50ca · 22d50ca
1 parent f7d3a99
commit 22d50ca
Show file tree

Hide file tree

Showing 258 changed files with 3,378 additions and 2,080 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,9 +33,12 @@ dependencies {
 
     // Fabric API
     modIncludeImplementation(fabricApi.module("fabric-api-base", project.fabric_version))
-    modIncludeImplementation(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version))
-    modIncludeImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", project.fabric_version))
     modIncludeImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version))
+    modIncludeImplementation(fabricApi.module("fabric-models-v0", project.fabric_version))
+    modIncludeImplementation(fabricApi.module("fabric-textures-v0", project.fabric_version))
+    modIncludeImplementation(fabricApi.module("fabric-renderer-api-v1", project.fabric_version))
+    modIncludeImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", project.fabric_version))
+    modIncludeImplementation(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version))
 }
 
 if (project.use_third_party_mods) {

diff --git a/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java b/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java
@@ -1,14 +1,16 @@
 package me.jellysquid.mods.sodium.client;
 
-import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
+import me.jellysquid.mods.sodium.client.config.SodiumRenderConfig;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
+import me.jellysquid.mods.sodium.client.interop.fabric.SodiumRenderer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 public class SodiumClientMod implements ClientModInitializer {
-    private static SodiumGameOptions CONFIG;
+    private static SodiumRenderConfig CONFIG;
     private static Logger LOGGER;
 
     private static String MOD_VERSION;
@@ -22,9 +24,11 @@ public void onInitializeClient() {
         MOD_VERSION = mod.getMetadata()
                 .getVersion()
                 .getFriendlyString();
+
+        RendererAccess.INSTANCE.registerRenderer(SodiumRenderer.INSTANCE);
     }
 
-    public static SodiumGameOptions options() {
+    public static SodiumRenderConfig options() {
         if (CONFIG == null) {
             CONFIG = loadConfig();
         }
@@ -40,8 +44,8 @@ public static Logger logger() {
         return LOGGER;
     }
 
-    private static SodiumGameOptions loadConfig() {
-        return SodiumGameOptions.load(FabricLoader.getInstance().getConfigDir().resolve("sodium-options.json"));
+    private static SodiumRenderConfig loadConfig() {
+        return SodiumRenderConfig.load(FabricLoader.getInstance().getConfigDir().resolve("sodium-options.json"));
     }
 
     public static String getVersion() {

diff --git a/...ds/sodium/common/config/SodiumConfig.java → ...dium/client/config/SodiumMixinConfig.java b/...ds/sodium/common/config/SodiumConfig.java → ...dium/client/config/SodiumMixinConfig.java
@@ -1,5 +1,6 @@
-package me.jellysquid.mods.sodium.common.config;
+package me.jellysquid.mods.sodium.client.config;
 
+import me.jellysquid.mods.sodium.client.config.mixin.MixinOption;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.fabricmc.loader.api.metadata.CustomValue;
@@ -16,14 +17,14 @@
  * Documentation of these options: https://github.com/jellysquid3/sodium-fabric/wiki/Configuration-File
  */
 @SuppressWarnings("CanBeFinal")
-public class SodiumConfig {
+public class SodiumMixinConfig {
     private static final Logger LOGGER = LogManager.getLogger("SodiumConfig");
 
     private static final String JSON_KEY_SODIUM_OPTIONS = "sodium:options";
 
-    private final Map<String, Option> options = new HashMap<>();
+    private final Map<String, MixinOption> options = new HashMap<>();
 
-    private SodiumConfig() {
+    private SodiumMixinConfig() {
         // Defines the default rules which can be configured by the user or other mods.
         // You must manually add a rule for any new mixins not covered by an existing package rule.
         this.addMixinRule("core", true); // TODO: Don't actually allow the user to disable this
@@ -67,7 +68,7 @@ private SodiumConfig() {
     private void addMixinRule(String mixin, boolean enabled) {
         String name = getMixinRuleName(mixin);
 
-        if (this.options.putIfAbsent(name, new Option(name, enabled, false)) != null) {
+        if (this.options.putIfAbsent(name, new MixinOption(name, enabled, false)) != null) {
             throw new IllegalStateException("Mixin rule already defined: " + mixin);
         }
     }
@@ -77,7 +78,7 @@ private void readProperties(Properties props) {
             String key = (String) entry.getKey();
             String value = (String) entry.getValue();
 
-            Option option = this.options.get(key);
+            MixinOption option = this.options.get(key);
 
             if (option == null) {
                 LOGGER.warn("No configuration key exists with name '{}', ignoring", key);
@@ -119,7 +120,7 @@ private void applyModOverrides() {
     }
 
     private void applyModOverride(ModMetadata meta, String name, CustomValue value) {
-        Option option = this.options.get(name);
+        MixinOption option = this.options.get(name);
 
         if (option == null) {
             LOGGER.warn("Mod '{}' attempted to override option '{}', which doesn't exist, ignoring", meta.getId(), name);
@@ -151,16 +152,16 @@ private void applyModOverride(ModMetadata meta, String name, CustomValue value)
      *
      * @return Null if no options matched the given mixin name, otherwise the effective option for this Mixin
      */
-    public Option getEffectiveOptionForMixin(String mixinClassName) {
+    public MixinOption getEffectiveOptionForMixin(String mixinClassName) {
         int lastSplit = 0;
         int nextSplit;
 
-        Option rule = null;
+        MixinOption rule = null;
 
         while ((nextSplit = mixinClassName.indexOf('.', lastSplit)) != -1) {
             String key = getMixinRuleName(mixinClassName.substring(0, nextSplit));
 
-            Option candidate = this.options.get(key);
+            MixinOption candidate = this.options.get(key);
 
             if (candidate != null) {
                 rule = candidate;
@@ -180,15 +181,15 @@ public Option getEffectiveOptionForMixin(String mixinClassName) {
      * Loads the configuration file from the specified location. If it does not exist, a new configuration file will be
      * created. The file on disk will then be updated to include any new options.
      */
-    public static SodiumConfig load(File file) {
+    public static SodiumMixinConfig load(File file) {
         if (!file.exists()) {
             try {
                 writeDefaultConfig(file);
             } catch (IOException e) {
                 LOGGER.warn("Could not write default configuration file", e);
             }
 
-            return new SodiumConfig();
+            return new SodiumMixinConfig();
         }
 
         Properties props = new Properties();
@@ -199,7 +200,7 @@ public static SodiumConfig load(File file) {
             throw new RuntimeException("Could not load config file", e);
         }
 
-        SodiumConfig config = new SodiumConfig();
+        SodiumMixinConfig config = new SodiumMixinConfig();
         config.readProperties(props);
         config.applyModOverrides();
 
@@ -238,7 +239,7 @@ public int getOptionCount() {
     public int getOptionOverrideCount() {
         return (int) this.options.values()
                 .stream()
-                .filter(Option::isOverridden)
+                .filter(MixinOption::isOverridden)
                 .count();
     }
 }
diff --git a/.../sodium/client/gui/SodiumGameOptions.java → ...ium/client/config/SodiumRenderConfig.java b/.../sodium/client/gui/SodiumGameOptions.java → ...ium/client/config/SodiumRenderConfig.java
@@ -1,9 +1,9 @@
-package me.jellysquid.mods.sodium.client.gui;
+package me.jellysquid.mods.sodium.client.config;
 
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import me.jellysquid.mods.sodium.client.gui.options.TextProvider;
+import me.jellysquid.mods.sodium.client.util.TextProvider;
 import net.minecraft.client.option.GraphicsMode;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
@@ -16,7 +16,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
-public class SodiumGameOptions {
+public class SodiumRenderConfig {
     public final QualitySettings quality = new QualitySettings();
     public final AdvancedSettings advanced = new AdvancedSettings();
     public final NotificationSettings notifications = new NotificationSettings();
@@ -95,17 +95,17 @@ public boolean isFancy(GraphicsMode graphicsMode) {
             .excludeFieldsWithModifiers(Modifier.PRIVATE)
             .create();
 
-    public static SodiumGameOptions load(Path path) {
-        SodiumGameOptions config;
+    public static SodiumRenderConfig load(Path path) {
+        SodiumRenderConfig config;
 
         if (Files.exists(path)) {
             try (FileReader reader = new FileReader(path.toFile())) {
-                config = GSON.fromJson(reader, SodiumGameOptions.class);
+                config = GSON.fromJson(reader, SodiumRenderConfig.class);
             } catch (IOException e) {
                 throw new RuntimeException("Could not parse config", e);
             }
         } else {
-            config = new SodiumGameOptions();
+            config = new SodiumRenderConfig();
         }
 
         config.configPath = path;

diff --git a/...uid/mods/sodium/common/config/Option.java → ...dium/client/config/mixin/MixinOption.java b/...uid/mods/sodium/common/config/Option.java → ...dium/client/config/mixin/MixinOption.java
@@ -1,18 +1,18 @@
-package me.jellysquid.mods.sodium.common.config;
+package me.jellysquid.mods.sodium.client.config.mixin;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public class Option {
+public class MixinOption {
     private final String name;
 
     private Set<String> modDefined = null;
     private boolean enabled;
     private boolean userDefined;
 
-    public Option(String name, boolean enabled, boolean userDefined) {
+    public MixinOption(String name, boolean enabled, boolean userDefined) {
         this.name = name;
         this.enabled = enabled;
         this.userDefined = userDefined;

diff --git a/...ods/sodium/client/gui/options/Option.java → ...s/sodium/client/config/render/Option.java b/...ods/sodium/client/gui/options/Option.java → ...s/sodium/client/config/render/Option.java
@@ -1,7 +1,7 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
-import me.jellysquid.mods.sodium.client.gui.options.control.Control;
-import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage;
+import me.jellysquid.mods.sodium.client.gui.options.Control;
+import me.jellysquid.mods.sodium.client.config.render.storage.OptionStorage;
 import net.minecraft.text.Text;
 
 import java.util.Collection;

diff --git a/...sodium/client/gui/options/OptionFlag.java → ...dium/client/config/render/OptionFlag.java b/...sodium/client/gui/options/OptionFlag.java → ...dium/client/config/render/OptionFlag.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
 public enum OptionFlag {
     REQUIRES_RENDERER_RELOAD,

diff --git a/...odium/client/gui/options/OptionGroup.java → ...ium/client/config/render/OptionGroup.java b/...odium/client/gui/options/OptionGroup.java → ...ium/client/config/render/OptionGroup.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
 import com.google.common.collect.ImmutableList;
 import org.apache.commons.lang3.Validate;

diff --git a/...dium/client/gui/options/OptionImpact.java → ...um/client/config/render/OptionImpact.java b/...dium/client/gui/options/OptionImpact.java → ...um/client/config/render/OptionImpact.java
@@ -1,5 +1,6 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
+import me.jellysquid.mods.sodium.client.util.TextProvider;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.minecraft.util.Formatting;

diff --git a/...sodium/client/gui/options/OptionImpl.java → ...dium/client/config/render/OptionImpl.java b/...sodium/client/gui/options/OptionImpl.java → ...dium/client/config/render/OptionImpl.java
@@ -1,9 +1,9 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
-import me.jellysquid.mods.sodium.client.gui.options.binding.GenericBinding;
-import me.jellysquid.mods.sodium.client.gui.options.binding.OptionBinding;
-import me.jellysquid.mods.sodium.client.gui.options.control.Control;
-import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage;
+import me.jellysquid.mods.sodium.client.config.render.binding.GenericBinding;
+import me.jellysquid.mods.sodium.client.config.render.binding.OptionBinding;
+import me.jellysquid.mods.sodium.client.gui.options.Control;
+import me.jellysquid.mods.sodium.client.config.render.storage.OptionStorage;
 import net.minecraft.text.Text;
 import org.apache.commons.lang3.Validate;
 

diff --git a/...sodium/client/gui/options/OptionPage.java → ...dium/client/config/render/OptionPage.java b/...sodium/client/gui/options/OptionPage.java → ...dium/client/config/render/OptionPage.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options;
+package me.jellysquid.mods.sodium.client.config.render;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.text.Text;

diff --git a/...t/gui/options/binding/GenericBinding.java → ...config/render/binding/GenericBinding.java b/...t/gui/options/binding/GenericBinding.java → ...config/render/binding/GenericBinding.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options.binding;
+package me.jellysquid.mods.sodium.client.config.render.binding;
 
 import java.util.function.BiConsumer;
 import java.util.function.Function;

diff --git a/...nt/gui/options/binding/OptionBinding.java → .../config/render/binding/OptionBinding.java b/...nt/gui/options/binding/OptionBinding.java → .../config/render/binding/OptionBinding.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options.binding;
+package me.jellysquid.mods.sodium.client.config.render.binding;
 
 public interface OptionBinding<S, T> {
     void setValue(S storage, T value);

diff --git a/...g/compat/VanillaBooleanOptionBinding.java → ...g/compat/VanillaBooleanOptionBinding.java b/...g/compat/VanillaBooleanOptionBinding.java → ...g/compat/VanillaBooleanOptionBinding.java
@@ -1,6 +1,6 @@
-package me.jellysquid.mods.sodium.client.gui.options.binding.compat;
+package me.jellysquid.mods.sodium.client.config.render.binding.compat;
 
-import me.jellysquid.mods.sodium.client.gui.options.binding.OptionBinding;
+import me.jellysquid.mods.sodium.client.config.render.binding.OptionBinding;
 import net.minecraft.client.option.CyclingOption;
 import net.minecraft.client.option.GameOptions;
 

diff --git a/...ions/storage/MinecraftOptionsStorage.java → ...nder/storage/MinecraftOptionsStorage.java b/...ions/storage/MinecraftOptionsStorage.java → ...nder/storage/MinecraftOptionsStorage.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options.storage;
+package me.jellysquid.mods.sodium.client.config.render.storage;
 
 import me.jellysquid.mods.sodium.client.SodiumClientMod;
 import net.minecraft.client.MinecraftClient;

diff --git a/...nt/gui/options/storage/OptionStorage.java → .../config/render/storage/OptionStorage.java b/...nt/gui/options/storage/OptionStorage.java → .../config/render/storage/OptionStorage.java
@@ -1,4 +1,4 @@
-package me.jellysquid.mods.sodium.client.gui.options.storage;
+package me.jellysquid.mods.sodium.client.config.render.storage;
 
 public interface OptionStorage<T> {
     T getData();

diff --git a/...options/storage/SodiumOptionsStorage.java → .../render/storage/SodiumOptionsStorage.java b/...options/storage/SodiumOptionsStorage.java → .../render/storage/SodiumOptionsStorage.java
@@ -1,19 +1,19 @@
-package me.jellysquid.mods.sodium.client.gui.options.storage;
+package me.jellysquid.mods.sodium.client.config.render.storage;
 
 import me.jellysquid.mods.sodium.client.SodiumClientMod;
-import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
+import me.jellysquid.mods.sodium.client.config.SodiumRenderConfig;
 
 import java.io.IOException;
 
-public class SodiumOptionsStorage implements OptionStorage<SodiumGameOptions> {
-    private final SodiumGameOptions options;
+public class SodiumOptionsStorage implements OptionStorage<SodiumRenderConfig> {
+    private final SodiumRenderConfig options;
 
     public SodiumOptionsStorage() {
         this.options = SodiumClientMod.options();
     }
 
     @Override
-    public SodiumGameOptions getData() {
+    public SodiumRenderConfig getData() {
         return this.options;
     }
 

diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/util/ElementRange.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/util/ElementRange.java
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/util/EnumBit.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/util/EnumBit.java