E X P E R I M E N T A L

Author: Seggan

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish build
 on:
   push:
     branches:
-      - master
+      - experimental
 
 jobs:
   publish:
@@ -26,7 +26,7 @@ jobs:
         uses: WalshyDev/blob-builds/gh-action@main
         with:
           project: Galactifun
-          releaseChannel: 'Dev'
+          releaseChannel: 'Experimental'
           apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
           file: ./build/libs/galactifun.jar
           releaseNotes: ${{ github.event.head_commit.message }}

build.gradle.kts

@@ -14,10 +14,10 @@ repositories {
 }
 
 dependencies {
-    api("io.github.mooy1:InfinityLib:1.3.7")
     compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT")
-    compileOnly("io.github.TheBusyBiscuit:Slimefun4:RC-37")
+    compileOnly("com.github.Slimefun:Slimefun4:experimental-SNAPSHOT")
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+    api("io.github.mooy1:InfinityLib:1.3.7")
 
     testImplementation("com.github.seeseemelk:MockBukkit-v1.18:2.85.2")
 }

src/main/java/io/github/addoncommunity/galactifun/api/items/ProtectingBlock.java

@@ -45,13 +45,13 @@ public abstract class ProtectingBlock extends MenuBlock implements EnergyNetComp
     protected static final String ENABLED = "enabled";
 
     private static final Set<BlockPosition> allBlocks = new HashSet<>();
-    private static final ItemStack ENABLED_ITEM = new CustomItemStack(
+    private static final ItemStack ENABLED_ITEM = CustomItemStack.create(
             Material.STRUCTURE_VOID,
             "&aEnabled",
             "",
             "&7Click to disable"
     );
-    private static final ItemStack DISABLED_ITEM = new CustomItemStack(
+    private static final ItemStack DISABLED_ITEM = CustomItemStack.create(
             Material.BARRIER,
             "&cDisabled",
             "",

src/main/java/io/github/addoncommunity/galactifun/api/items/Rocket.java

@@ -1,10 +1,5 @@
 package io.github.addoncommunity.galactifun.api.items;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
@@ -63,6 +58,10 @@
 import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction;
 import io.github.thebusybiscuit.slimefun4.libraries.paperlib.PaperLib;
 import io.github.thebusybiscuit.slimefun4.utils.ChatUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import me.mrCookieSlime.Slimefun.api.BlockStorage;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -314,7 +313,7 @@ public List<ItemStack> getDisplayRecipes() {
         List<ItemStack> ret = new ArrayList<>();
 
         for (Map.Entry<ItemStack, Double> entry : getAllowedFuels().entrySet()) {
-            ret.add(new CustomItemStack(
+            ret.add(CustomItemStack.create(
                     entry.getKey(),
                     ItemUtils.getItemName(entry.getKey()),
                     "&7Efficiency: " + entry.getValue() + 'x'

src/main/java/io/github/addoncommunity/galactifun/api/universe/UniversalObject.java

@@ -39,7 +39,7 @@ public abstract class UniversalObject {
     UniversalObject(@Nonnull String name, @Nonnull UniversalType type, @Nonnull Orbit orbit,
                     @Nonnull UniversalObject orbiting, @Nonnull ItemStack baseItem) {
         this.name = ChatUtils.removeColorCodes(name);
-        this.item = new CustomItemStack(baseItem, name, "&7Type: " + type.description());
+        this.item = CustomItemStack.create(baseItem, name, "&7Type: " + type.description());
         this.orbiting = orbiting;
         this.orbit = orbit;
         this.orbitLevel = orbiting.orbitLevel + 1;

src/main/java/io/github/addoncommunity/galactifun/api/universe/attributes/atmosphere/Gas.java

@@ -3,19 +3,18 @@
 import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import io.github.addoncommunity.galactifun.api.universe.PlanetaryObject;
-import io.github.addoncommunity.galactifun.base.BaseUniverse;
-import io.github.addoncommunity.galactifun.core.CoreRecipeType;
-
 import lombok.Getter;
 
 import org.bukkit.inventory.ItemStack;
 
 import io.github.addoncommunity.galactifun.Galactifun;
+import io.github.addoncommunity.galactifun.api.universe.PlanetaryObject;
 import io.github.addoncommunity.galactifun.base.BaseItems;
 import io.github.addoncommunity.galactifun.base.BaseMats;
+import io.github.addoncommunity.galactifun.base.BaseUniverse;
 import io.github.addoncommunity.galactifun.base.items.DiamondAnvil;
 import io.github.addoncommunity.galactifun.core.CoreItemGroup;
+import io.github.addoncommunity.galactifun.core.CoreRecipeType;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
@@ -37,18 +36,18 @@ public enum Gas {
     HYDROCARBONS("725691372e0734bfb57bb03690490661a83f053a3488860df3436ce1caa24d11"),
     HYDROGEN("725691372e0734bfb57bb03690490661a83f053a3488860df3436ce1caa24d11"),
     AMMONIA("c7a1ece691ad28d17bbbcecb22270c85e1c9581485806264c676de67c272e2d0", CoreRecipeType.CHEMICAL_REACTOR, new ItemStack[] {
-            NITROGEN.item, HYDROGEN.item.asQuantity(3), null,
+            NITROGEN.item.item(), HYDROGEN.item.asQuantity(3), null,
             null, null, null,
             null, null, null
     }),
     OTHER;
 
     static {
         if (SlimefunItems.FREEZER_2.getItem() instanceof Freezer freezer) {
-            freezer.registerRecipe(10, NITROGEN.item(), SlimefunItems.REACTOR_COOLANT_CELL.asQuantity(4));
+            freezer.registerRecipe(10, NITROGEN.item().item(), SlimefunItems.REACTOR_COOLANT_CELL.asQuantity(4));
         }
         if (SlimefunItems.FREEZER_3.getItem() instanceof  Freezer freezer) {
-            freezer.registerRecipe(7, NITROGEN.item(), SlimefunItems.REACTOR_COOLANT_CELL.asQuantity(4));
+            freezer.registerRecipe(7, NITROGEN.item().item(), SlimefunItems.REACTOR_COOLANT_CELL.asQuantity(4));
         }
 
         if (SlimefunItems.COMBUSTION_REACTOR.getItem() instanceof CombustionGenerator generator) {
@@ -59,8 +58,8 @@ public enum Gas {
         }
 
         if (BaseItems.DIAMOND_ANVIL.getItem() instanceof DiamondAnvil anvil) {
-            anvil.registerRecipe(10, HYDROGEN.item().asQuantity(4), HELIUM.item());
-            anvil.registerRecipe(10, HELIUM.item().asQuantity(4), BaseMats.FUSION_PELLET);
+            anvil.registerRecipe(10, HYDROGEN.item().asQuantity(4), HELIUM.item().item());
+            anvil.registerRecipe(10, HELIUM.item().asQuantity(4), BaseMats.FUSION_PELLET.item());
         }
     }