🚀 v1.2.0

TeamGensouSpark · Aug 23, 2023 · d00c69f · d00c69f
1 parent c61bff6
commit d00c69f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/src/main/java/io/github/teamgensouspark/kekkai/color/builder/ColorMap.java b/src/main/java/io/github/teamgensouspark/kekkai/color/builder/ColorMap.java
@@ -1,7 +1,6 @@
 package io.github.teamgensouspark.kekkai.color.builder;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 import io.github.teamgensouspark.kekkai.Kekkai;
@@ -20,24 +19,15 @@ public ColorMap(int length, KekkaiColor normal) {
     public List<Integer> getListRGB() {
         int iter_num = (length - 1) / 2;
 
-        KekkaiColor ndark = normal.getDarkderColor();
-        KekkaiColor nlight = normal.getBrighterColor();
-
-        List<Integer> result = new ArrayList<>();
-        List<Integer> dark = new ArrayList<>();
-        List<Integer> light = new ArrayList<>();
+        List<Integer> result = Arrays.asList(normal.getRGB());
+        KekkaiColor darker = normal.getDarkderColor();
+        KekkaiColor lighter = normal.getBrighterColor();
 
         for (int i = 0; i < iter_num; i++) {
-            dark.add(ndark.getRGB());
-            light.add(nlight.getRGB());
-
-            ndark = ndark.getDarkderColor();
-            nlight = nlight.getBrighterColor();
+            result.add(0, darker.getRGB());
+            result.add(lighter.getRGB());
         }
-        Collections.reverse(dark);
-        result.addAll(dark);
-        result.add(normal.getRGB());
-        result.addAll(light);
+
         return result;
     }
 

diff --git a/src/main/java/io/github/teamgensouspark/kekkai/color/builder/KekkaiColor.java b/src/main/java/io/github/teamgensouspark/kekkai/color/builder/KekkaiColor.java
@@ -3,28 +3,33 @@
 import java.awt.Color;
 
 public class KekkaiColor {
-    Color normal;
-    Color darker;
-    Color brighter;
+    private Color normal;
+    private Color darker;
+    private Color brighter;
 
     public KekkaiColor(Color color) {
         this.normal = color;
         this.brighter = color.brighter();
         this.darker = color.darker();
     }
-    
+
     public KekkaiColor getDarkderColor() {
         return KekkaiColor.fromColor(darker);
     }
 
     public KekkaiColor getBrighterColor() {
         return KekkaiColor.fromColor(brighter);
     }
-    
-    public int getRGB(){
+
+    public Integer getRGB() {
         return normal.getRGB();
     }
 
+    public String getHEX() {
+        Color rgb = new Color(getRGB());
+        return String.format("#%02X%02X%02X", rgb.getRed(), rgb.getGreen(), rgb.getBlue());
+    }
+
     public static KekkaiColor fromRGB(int red, int green, int blue) {
         return new KekkaiColor(new Color(red, green, blue));
     }
@@ -33,6 +38,10 @@ public static KekkaiColor fromRGB(int color) {
         return new KekkaiColor(new Color(color));
     }
 
+    public static KekkaiColor fromHEX(String color) {
+        return new KekkaiColor(Color.decode(color));
+    }
+
     public static KekkaiColor fromColor(Color color) {
         return new KekkaiColor(color);
     }

diff --git a/src/main/java/io/github/teamgensouspark/kekkai/config/KekkaiKeyBindings.java b/src/main/java/io/github/teamgensouspark/kekkai/config/KekkaiKeyBindings.java
@@ -2,7 +2,6 @@
 
 import org.lwjgl.input.Keyboard;
 
-import io.github.teamgensouspark.kekkai.Kekkai;
 import io.github.teamgensouspark.kekkai.KekkaiModInfo;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraftforge.client.settings.KeyConflictContext;

diff --git a/src/main/java/io/github/teamgensouspark/kekkai/danmaku/subentity/impl/KekkaiSubEntities.java b/src/main/java/io/github/teamgensouspark/kekkai/danmaku/subentity/impl/KekkaiSubEntities.java
@@ -9,7 +9,7 @@
 
 @EventBusSubscriber(modid = KekkaiModInfo.MODID)
 public class KekkaiSubEntities {
-    public static final SubEntityType TRACKING = new SubEntityBase<>("tracking_target", TrackingTargetSubEntity.class);
+    public static final SubEntityType TRACKING = new SubEntityBase<TrackingTargetSubEntity>("tracking_target", TrackingTargetSubEntity.class);
 
     @SubscribeEvent
     public static void onSubEntityRegister(RegistryEvent.Register<SubEntityType> event) {

diff --git a/src/main/java/io/github/teamgensouspark/kekkai/utils/ScalaJ.java b/src/main/java/io/github/teamgensouspark/kekkai/utils/ScalaJ.java
@@ -22,7 +22,7 @@ public static <T> Optional<T> asOptional(Option<T> option) {
         return DanCoreJavaHelper.optional(option);
     }
 
-    public static <T> Option<T> optionNone() {
+    public static <T> Option<T> none() {
         return DanCoreJavaHelper.none();
     }