update

InfinityStudio · Jan 5, 2022 · 53fe8a3 · 53fe8a3
1 parent 77baa72
commit 53fe8a3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,3 +26,12 @@ jobs:
 
           curseforge-id: 298141
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          files-primary: build/libs/!(*-@(dev|sources)).jar
+          files-secondary: build/libs/*-@(dev|sources).jar
+          loaders: |
+            forge
+          game-versions: |
+            1.16.5
+          version-type: beta
+          java: |
+            8
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
-        jcenter()
+        mavenCentral()
 		maven {
 		  url "https://plugins.gradle.org/m2/"
 		}

diff --git a/src/main/java/net/infstudio/goki/api/stat/StatBase.java b/src/main/java/net/infstudio/goki/api/stat/StatBase.java
@@ -30,7 +30,7 @@ public abstract class StatBase<T extends StatConfig> extends ForgeRegistryEntry<
             .setName(new ResourceLocation(Reference.MODID, "stats"))
             .setType(Stat.class)
             .create();
-    public static final ObjectList<StatBase> stats = new ObjectArrayList<>(16);
+    public static final ObjectList<StatBase<?>> stats = new ObjectArrayList<>(16);
     public static LazyOptional<Integer> totalStats = LazyOptional.of(() -> REGISTRY.getValues().size());
     public int imageID;
     public String key;
@@ -64,6 +64,7 @@ protected float getFinalBonus(float currentBonus) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public T createConfig(ForgeConfigSpec.Builder builder) {
         builder.comment("Server configuration settings")
                 .push("stats." + key);

diff --git a/src/main/java/net/infstudio/goki/client/gui/GuiExtendedButton.java b/src/main/java/net/infstudio/goki/client/gui/GuiExtendedButton.java
@@ -6,6 +6,8 @@
 import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.opengl.GL11;
 
+import javax.annotation.Nonnull;
+
 public class GuiExtendedButton extends Button {
     public static final int BORDER_COLOR = -16777216;
 
@@ -22,7 +24,7 @@ public GuiExtendedButton(int id, int x, int y, int width, int height, ITextCompo
 
 
     @Override
-    public void renderButton(MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void renderButton(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
         if (!this.disabled) {
             if (!isUnderMouse(mouseX, mouseY)) {
                 drawIdle(stack, Minecraft.getInstance(), mouseX, mouseY);

diff --git a/src/main/java/net/infstudio/goki/client/gui/GuiStatButton.java b/src/main/java/net/infstudio/goki/client/gui/GuiStatButton.java
@@ -13,7 +13,7 @@
 import org.lwjgl.opengl.GL11;
 
 public class GuiStatButton extends Button {
-    public StatBase stat;
+    public StatBase<?> stat;
     public PlayerEntity player;
 
     public static final int INACTIVE_X = 0;
@@ -24,15 +24,16 @@ public class GuiStatButton extends Button {
     public final int id;
     private final Minecraft mc = Minecraft.getInstance();
 
-    public GuiStatButton(int id, int x, int y, int width, int height, StatBase stat, PlayerEntity player, IPressable onPress) {
+    public GuiStatButton(int id, int x, int y, int width, int height, StatBase<?> stat, PlayerEntity player, IPressable onPress) {
         super(x, y, width, height, StringTextComponent.EMPTY, onPress);
         this.id = id;
         this.stat = stat;
         this.player = player;
     }
 
     @Override
-    public void renderButton(MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void renderButton(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+
         if (this.visible) {
             int iconY = 24 * (this.stat.imageID % 10);
             int level = DataHelper.getPlayerStatLevel(this.player, this.stat);

diff --git a/src/main/java/net/infstudio/goki/common/stat/StatMaxHealth.java b/src/main/java/net/infstudio/goki/common/stat/StatMaxHealth.java
@@ -2,10 +2,11 @@
 
 import net.infstudio.goki.api.stat.StatBase;
 import net.infstudio.goki.common.config.GokiConfig;
+import net.infstudio.goki.common.config.stats.StatConfig;
 import net.infstudio.goki.common.utils.DataHelper;
 import net.minecraft.entity.player.PlayerEntity;
 
-public class StatMaxHealth extends StatBase {
+public class StatMaxHealth extends StatBase<StatConfig> {
 
     public StatMaxHealth(int id, String key, int limit) {
         super(id, key, limit);