Something is broken... not sure what

Author: OroArmor

build.gradle

@@ -19,9 +19,8 @@ buildscript {
 }
 
 plugins {
-    id "architectury-plugin" version "2.0.66"
-    id "forgified-fabric-loom" version "0.6.64" apply false
-    id 'com.jfrog.bintray' version "1.8.4"
+    id "architectury-plugin" version "3.1-SNAPSHOT"
+    id "forgified-fabric-loom" version "0.6.96" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id 'maven-publish'
     id "maven"
@@ -59,7 +58,6 @@ subprojects {
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
-    apply plugin: "com.jfrog.bintray"
 
     archivesBaseName = rootProject.archives_base_name
     version = rootProject.mod_version + "-" + rootProject.minecraft_version

common/build.gradle

@@ -1,8 +1,5 @@
 repositories {
     mavenCentral()
-    maven {
-        url = "https://dl.bintray.com/oroarmor/oroarmor"
-    }
 }
 
 minecraft {
@@ -20,11 +17,11 @@ dependencies {
         exclude(module: "fabric-api")
     }
 
-    modCompile('com.oroarmor:oro-config-common:2.0.0') {
+    modCompile('com.oroarmor:oro-config-common:3.0.0') {
         exclude(module: "fabric-loader")
     }
 
-    modCompile('com.oroarmor:Multi-Item-Lib:1.2.0') {
+    modCompile('com.oroarmor:multi-item-lib:1.3.0') {
         exclude(module: "fabric-api")
         exclude(module: "fabric-loader")
     }
@@ -65,21 +62,4 @@ publishing {
             version project.version
         }
     }
-}
-
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-    publications = ["mavenCommon"]
-    publish = true
-    pkg {
-        repo = 'oroarmor'
-        name = rootProject.archives_base_name
-        userOrg = "oroarmor"
-        licenses = ['CC0-1.0']
-        vcsUrl = 'https://github.com/OroArmor/Netherite-Plus-Mod.git'
-        version {
-            name = rootProject.mod_version + "-" + rootProject.minecraft_version
-        }
-    }
-}
+}

common/src/main/java/com/oroarmor/netherite_plus/config/NetheritePlusConfig.java

@@ -28,9 +28,7 @@
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import com.oroarmor.config.Config;
-import com.oroarmor.config.ConfigItem;
-import com.oroarmor.config.ConfigItemGroup;
+import com.oroarmor.config.*;
 import com.oroarmor.netherite_plus.NetheritePlusMod;
 import com.oroarmor.netherite_plus.network.LavaVisionUpdatePacket;
 import io.netty.buffer.Unpooled;
@@ -62,7 +60,7 @@ public static void createLavaVisionUpdatePacket(PlayerEntity player) {
     }
 
     public static class ANVIL extends ConfigItemGroup {
-        public static final ConfigItem<Double> XP_REDUCTION = new ConfigItem<>("xp_reduction", 0.5, "config.netherite_plus.anvil.xp_redcution");
+        public static final ConfigItem<Double> XP_REDUCTION = new DoubleConfigItem("xp_reduction", 0.5, "config.netherite_plus.anvil.xp_redcution");
 
         public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(XP_REDUCTION);
 
@@ -72,13 +70,13 @@ public ANVIL() {
     }
 
     public static class DAMAGE extends ConfigItemGroup {
-        public static final ConfigItem<Double> BOW_DAMAGE_ADDITION = new ConfigItem<>("bow_damage_addition", 0d, "config.netherite_plus.damage.bow_damage_addition");
-        public static final ConfigItem<Double> BOW_DAMAGE_MULTIPLIER = new ConfigItem<>("bow_damage_multiplier", 1d, "config.netherite_plus.damage.bow_damage_multiplier");
-        public static final ConfigItem<Double> CROSSBOW_DAMAGE_ADDITION = new ConfigItem<>("crossbow_damage_addition", 0d, "config.netherite_plus.damage.crossbow_damage_addition");
-        public static final ConfigItem<Double> CROSSBOW_DAMAGE_MULTIPLIER = new ConfigItem<>("crossbow_damage_multiplier", 1d, "config.netherite_plus.damage.crossbow_damage_multiplier");
-        public static final ConfigItem<Double> TRIDENT_DAMAGE_ADDITION = new ConfigItem<>("trident_damage_addition", 0d, "config.netherite_plus.damage.trident_damage_addition");
-        public static final ConfigItem<Double> TRIDENT_DAMAGE_MULTIPLIER = new ConfigItem<>("trident_damage_multiplier", 1d, "config.netherite_plus.damage.trident_damage_multiplier");
-        public static final ConfigItem<Integer> ELYTRA_ARMOR_POINTS = new ConfigItem("elytra_armor_points", 4, "config.netherite_plus.damage.elytra_armor_points");
+        public static final ConfigItem<Double> BOW_DAMAGE_ADDITION = new DoubleConfigItem("bow_damage_addition", 0d, "config.netherite_plus.damage.bow_damage_addition");
+        public static final ConfigItem<Double> BOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("bow_damage_multiplier", 1d, "config.netherite_plus.damage.bow_damage_multiplier");
+        public static final ConfigItem<Double> CROSSBOW_DAMAGE_ADDITION = new DoubleConfigItem("crossbow_damage_addition", 0d, "config.netherite_plus.damage.crossbow_damage_addition");
+        public static final ConfigItem<Double> CROSSBOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("crossbow_damage_multiplier", 1d, "config.netherite_plus.damage.crossbow_damage_multiplier");
+        public static final ConfigItem<Double> TRIDENT_DAMAGE_ADDITION = new DoubleConfigItem("trident_damage_addition", 0d, "config.netherite_plus.damage.trident_damage_addition");
+        public static final ConfigItem<Double> TRIDENT_DAMAGE_MULTIPLIER = new DoubleConfigItem("trident_damage_multiplier", 1d, "config.netherite_plus.damage.trident_damage_multiplier");
+        public static final ConfigItem<Integer> ELYTRA_ARMOR_POINTS = new IntegerConfigItem("elytra_armor_points", 4, "config.netherite_plus.damage.elytra_armor_points");
 
         public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(BOW_DAMAGE_ADDITION, BOW_DAMAGE_MULTIPLIER, CROSSBOW_DAMAGE_ADDITION, CROSSBOW_DAMAGE_MULTIPLIER, TRIDENT_DAMAGE_ADDITION, TRIDENT_DAMAGE_MULTIPLIER, ELYTRA_ARMOR_POINTS);
 
@@ -88,12 +86,12 @@ public DAMAGE() {
     }
 
     public static class DURABILITIES extends ConfigItemGroup {
-        public static final ConfigItem<Integer> BOW_DURABILITY = new ConfigItem<>("bow", 768, "config.netherite_plus.durabilities.bow");
-        public static final ConfigItem<Integer> CROSSBOW_DURABILITY = new ConfigItem<>("crossbow", 652, "config.netherite_plus.durabilities.crossbow");
-        public static final ConfigItem<Integer> ELYTRA_DURABILITY = new ConfigItem<>("elytra", 864, "config.netherite_plus.durabilities.elytra");
-        public static final ConfigItem<Integer> FISHING_ROD_DURABILITY = new ConfigItem<>("fishing_rod", 128, "config.netherite_plus.durabilities.fishing_rod");
-        public static final ConfigItem<Integer> SHIELD_DURABILITY = new ConfigItem<>("shield", 672, "config.netherite_plus.durabilities.shield");
-        public static final ConfigItem<Integer> TRIDENT_DURABILITY = new ConfigItem<>("trident", 500, "config.netherite_plus.durabilities.trident");
+        public static final ConfigItem<Integer> BOW_DURABILITY = new IntegerConfigItem("bow", 768, "config.netherite_plus.durabilities.bow");
+        public static final ConfigItem<Integer> CROSSBOW_DURABILITY = new IntegerConfigItem("crossbow", 652, "config.netherite_plus.durabilities.crossbow");
+        public static final ConfigItem<Integer> ELYTRA_DURABILITY = new IntegerConfigItem("elytra", 864, "config.netherite_plus.durabilities.elytra");
+        public static final ConfigItem<Integer> FISHING_ROD_DURABILITY = new IntegerConfigItem("fishing_rod", 128, "config.netherite_plus.durabilities.fishing_rod");
+        public static final ConfigItem<Integer> SHIELD_DURABILITY = new IntegerConfigItem("shield", 672, "config.netherite_plus.durabilities.shield");
+        public static final ConfigItem<Integer> TRIDENT_DURABILITY = new IntegerConfigItem("trident", 500, "config.netherite_plus.durabilities.trident");
         public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ELYTRA_DURABILITY, FISHING_ROD_DURABILITY, SHIELD_DURABILITY, BOW_DURABILITY, CROSSBOW_DURABILITY, TRIDENT_DURABILITY);
 
         public DURABILITIES() {
@@ -102,17 +100,17 @@ public DURABILITIES() {
     }
 
     public static class ENABLED extends ConfigItemGroup {
-        public static final ConfigItem<Boolean> ENABLED_CONFIG_PRINT = new ConfigItem<>("config_debug_print", false, "config.netherite_plus.enabled.config_debug_print");
-        public static final ConfigItem<Boolean> ENABLED_ANVIL = new ConfigItem<>("anvils", true, "config.netherite_plus.enabled.anvils");
-        public static final ConfigItem<Boolean> ENABLED_BOWS_AND_CROSSBOWS = new ConfigItem<>("bows_and_crossbows", true, "config.netherite_plus.enabled.bows_crossbows");
-        public static final ConfigItem<Boolean> ENABLED_ELYTRA = new ConfigItem<>("elytra", true, "config.netherite_plus.enabled.elytra");
-        public static final ConfigItem<Boolean> ENABLED_FAKE_NETHERITE_BLOCKS = new ConfigItem<>("fake_netherite_blocks", true, "config.netherite_plus.enabled.fake_netherite_blocks");
-        public static final ConfigItem<Boolean> ENABLED_FISHING_ROD = new ConfigItem<>("fishing_rod", true, "config.netherite_plus.enabled.fishing_rod");
-        public static final ConfigItem<Boolean> ENABLED_HORSE_ARMOR = new ConfigItem<>("horse_armor", true, "config.netherite_plus.enabled.horse_armor");
-        public static final ConfigItem<Boolean> ENABLED_SHIELDS = new ConfigItem<>("shields", true, "config.netherite_plus.enabled.shields");
-        public static final ConfigItem<Boolean> ENABLED_SHULKER_BOXES = new ConfigItem<>("shulker_boxes", true, "config.netherite_plus.enabled.shulker_boxes");
-        public static final ConfigItem<Boolean> ENABLED_TRIDENT = new ConfigItem<>("trident", true, "config.netherite_plus.enabled.trident");
-        public static final ConfigItem<Boolean> ENABLED_BEACON = new ConfigItem<>("beacon", true, "config.netherite_plus.enabled.beacon");
+        public static final ConfigItem<Boolean> ENABLED_CONFIG_PRINT = new BooleanConfigItem("config_debug_print", false, "config.netherite_plus.enabled.config_debug_print");
+        public static final ConfigItem<Boolean> ENABLED_ANVIL = new BooleanConfigItem("anvils", true, "config.netherite_plus.enabled.anvils");
+        public static final ConfigItem<Boolean> ENABLED_BOWS_AND_CROSSBOWS = new BooleanConfigItem("bows_and_crossbows", true, "config.netherite_plus.enabled.bows_crossbows");
+        public static final ConfigItem<Boolean> ENABLED_ELYTRA = new BooleanConfigItem("elytra", true, "config.netherite_plus.enabled.elytra");
+        public static final ConfigItem<Boolean> ENABLED_FAKE_NETHERITE_BLOCKS = new BooleanConfigItem("fake_netherite_blocks", true, "config.netherite_plus.enabled.fake_netherite_blocks");
+        public static final ConfigItem<Boolean> ENABLED_FISHING_ROD = new BooleanConfigItem("fishing_rod", true, "config.netherite_plus.enabled.fishing_rod");
+        public static final ConfigItem<Boolean> ENABLED_HORSE_ARMOR = new BooleanConfigItem("horse_armor", true, "config.netherite_plus.enabled.horse_armor");
+        public static final ConfigItem<Boolean> ENABLED_SHIELDS = new BooleanConfigItem("shields", true, "config.netherite_plus.enabled.shields");
+        public static final ConfigItem<Boolean> ENABLED_SHULKER_BOXES = new BooleanConfigItem("shulker_boxes", true, "config.netherite_plus.enabled.shulker_boxes");
+        public static final ConfigItem<Boolean> ENABLED_TRIDENT = new BooleanConfigItem("trident", true, "config.netherite_plus.enabled.trident");
+        public static final ConfigItem<Boolean> ENABLED_BEACON = new BooleanConfigItem("beacon", true, "config.netherite_plus.enabled.beacon");
 
         public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ENABLED_SHULKER_BOXES, ENABLED_ELYTRA, ENABLED_SHIELDS, ENABLED_BOWS_AND_CROSSBOWS, ENABLED_FISHING_ROD, ENABLED_HORSE_ARMOR, ENABLED_FAKE_NETHERITE_BLOCKS, ENABLED_ANVIL, ENABLED_CONFIG_PRINT, ENABLED_TRIDENT, ENABLED_BEACON);
 
@@ -122,7 +120,7 @@ public ENABLED() {
     }
 
     public static class GRAPHICS extends ConfigItemGroup {
-        public static final ConfigItem<Double> LAVA_VISION_DISTANCE = new ConfigItem<>("lava_vision_distance", 0.25, "config.netherite_plus.graphics.lava_vision", NetheritePlusConfig::createLavaVisionUpdatePacket);
+        public static final ConfigItem<Double> LAVA_VISION_DISTANCE = new DoubleConfigItem("lava_vision_distance", 0.25, "config.netherite_plus.graphics.lava_vision", NetheritePlusConfig::createLavaVisionUpdatePacket);
 
         public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(LAVA_VISION_DISTANCE);
 

common/src/main/java/com/oroarmor/netherite_plus/mixin/render/ItemRendererAccessor.java

@@ -37,9 +37,9 @@
 
 @Mixin(ItemRenderer.class)
 public interface ItemRendererAccessor {
-    @Accessor
-    ItemModels getModels();
+    @Accessor("models")
+    ItemModels netherite_plus$getModels();
 
-    @Invoker
-    void callRenderBakedItemModel(BakedModel model, ItemStack stack, int light, int overlay, MatrixStack matrices, VertexConsumer vertexConsumer4);
+    @Invoker("renderBakedItemModel")
+    void netherite_plus$renderBakedItemModel(BakedModel model, ItemStack stack, int light, int overlay, MatrixStack matrices, VertexConsumer vertexConsumer4);
 }

common/src/main/java/com/oroarmor/netherite_plus/mixin/render/ItemRendererMixin.java

@@ -53,7 +53,7 @@ public void renderItem(ItemStack stack, ModelTransformation.Mode renderMode, boo
             matrices.push();
             boolean bl = renderMode == ModelTransformation.Mode.GUI || renderMode == ModelTransformation.Mode.GROUND || renderMode == ModelTransformation.Mode.FIXED;
             if (stack.getItem() == NetheritePlusItems.NETHERITE_TRIDENT.get() && bl) {
-                model = ((ItemRendererAccessor) this).getModels().getModelManager().getModel(new ModelIdentifier(MOD_ID + ":netherite_trident#inventory"));
+                model = ((ItemRendererAccessor) this).netherite_plus$getModels().getModelManager().getModel(new ModelIdentifier(MOD_ID + ":netherite_trident#inventory"));
             }
 
             model.getTransformation().getTransformation(renderMode).apply(leftHanded, matrices);
@@ -65,7 +65,7 @@ public void renderItem(ItemStack stack, ModelTransformation.Mode renderMode, boo
                 VertexConsumer vertexConsumer4;
                 vertexConsumer4 = ItemRenderer.getDirectItemGlintConsumer(vertexConsumers, renderLayer, true, stack.hasGlint());
 
-                ((ItemRendererAccessor) this).callRenderBakedItemModel(model, stack, light, overlay, matrices, vertexConsumer4);
+                ((ItemRendererAccessor) this).netherite_plus$renderBakedItemModel(model, stack, light, overlay, matrices, vertexConsumer4);
             }
 
             matrices.pop();

fabric/build.gradle

@@ -13,6 +13,7 @@ configurations {
 
 architectury {
     platformSetupLoomIde()
+    fabric()
 }
 
 repositories {
@@ -31,12 +32,9 @@ repositories {
         name = "NerdHubMC"
         url = "https://maven.abusedmaster.xyz/"
     }
-    maven { url = "https://dl.bintray.com/kyrptonaught/Quickshulker/" }
-    maven { url = "https://dl.bintray.com/kyrptonaught/kyrptconfig/" }
+//    maven { url = "https://dl.bintray.com/kyrptonaught/Quickshulker/" }
+//    maven { url = "https://dl.bintray.com/kyrptonaught/kyrptconfig/" }
     maven { url = "https://maven.misterpemodder.com/libs-release/" }
-    maven {
-        url = "https://dl.bintray.com/oroarmor/oroarmor"
-    }
     maven {
         url = "http://maven.terraformersmc.com/releases/"
     }
@@ -112,10 +110,10 @@ dependencies {
     modCompile "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
 
     //Libraries
-    includeLibraries(['com.oroarmor:oro-config-fabric:2.0.0',
-                      'com.oroarmor:Multi-Item-Lib:1.2.0'])
+    includeLibraries(['com.oroarmor:oro-config-fabric:3.0.0',
+                      'com.oroarmor:multi-item-lib:1.3.0'])
 
-    runAndCompile(["net.kyrptonaught:quickshulker:${project.quickshulker}",
+    runAndCompile([/*"net.kyrptonaught:quickshulker:${project.quickshulker}",*/
                    "com.github.emilyploszaj:trinkets:${project.trinkets}",
                    "com.misterpemodder:shulkerboxtooltip:${project.shulkerboxtooltip}+"+/*${project.minecraft_version}*/"1.16.4",
     ], true)
@@ -133,21 +131,21 @@ dependencies {
         exclude(module: "modmenu")
     }
 
-    modCompile("me.shedaniel:architectury:${rootProject.architectury_version}:fabric") {
+    modCompile("me.shedaniel:architectury-fabric:${rootProject.architectury_version}") {
         exclude(module: "fabric-api")
         exclude(module: "modmenu")
     }
 
-    include("me.shedaniel:architectury:${rootProject.architectury_version}:fabric") {
+    include("me.shedaniel:architectury-fabric:${rootProject.architectury_version}") {
         exclude(module: "fabric-api")
         exclude(module: "modmenu")
     }
 
-    compileOnly(project(path: ":common")) {
+    implementation(project(path: ":common")) {
         transitive = false
         exclude(module: "fabric-api")
     }
-    runtimeOnly(project(path: ":common", configuration: "transformDevelopmentFabric")) {
+    developmentFabric(project(path: ":common")) {
         transitive = false
         exclude(module: "fabric-api")
     }
@@ -223,23 +221,6 @@ publishing {
     }
 }
 
-bintray {
-    user = System.getenv('BINTRAY_USER')
-    key = System.getenv('BINTRAY_KEY')
-    publications = ["mavenFabric"]
-    publish = true
-    pkg {
-        repo = 'oroarmor'
-        name = rootProject.archives_base_name
-        userOrg = "oroarmor"
-        licenses = ['CC0-1.0']
-        vcsUrl = 'https://github.com/OroArmor/Netherite-Plus-Mod.git'
-        version {
-            name = rootProject.mod_version + "-" + rootProject.minecraft_version
-        }
-    }
-}
-
 curseforge {
     if (System.getenv("CURSE_API_KEY") != null) {
         apiKey = System.getenv("CURSE_API_KEY")

fabric/src/main/java/com/oroarmor/netherite_plus/NetheritePlusModFabric.java

@@ -26,6 +26,8 @@
 
 import com.oroarmor.config.command.ConfigCommand;
 
+import net.minecraft.server.command.ServerCommandSource;
+
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
@@ -37,6 +39,6 @@ public void onInitialize() {
 		ServerLifecycleEvents.SERVER_STOPPED.register(l -> NetheritePlusMod.CONFIG.saveConfigToFile());
 
 		NetheritePlusMod.registerItemsWithMultiItemLib();
-		CommandRegistrationCallback.EVENT.register(new ConfigCommand(NetheritePlusMod.CONFIG)::register);
+		CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> new ConfigCommand<ServerCommandSource>(NetheritePlusMod.CONFIG).register(dispatcher, (p) -> p.hasPermissionLevel(2)));
 	}
 }