Add configuration support and update version to 1.21.1

Author: Hexeption

build.gradle

@@ -3,14 +3,18 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.142'
+    id 'net.neoforged.gradle.userdev' version '7.0.181'
     id 'net.darkhax.curseforgegradle' version '1.1.15'
     id "com.modrinth.minotaur" version "2.+"
 }
 
+tasks.named('wrapper', Wrapper).configure {
+    distributionType = Wrapper.DistributionType.BIN
+}
+
 def env = System.getenv()
 if (env.GITHUB_RUN_NUMBER) {
-    mod_version = '1.21-1.0.1' + "." + "${env.GITHUB_RUN_NUMBER}"
+    mod_version = '1.21.1-1.0.0' + "." + "${env.GITHUB_RUN_NUMBER}"
 }
 
 version = mod_version
@@ -53,19 +57,20 @@ runs {
 
     client {
         systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
     }
 
     server {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
-        programArgument '--nogui'
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        argument '--nogui'
     }
 
     gameTestServer {
-        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
     }
 
     data {
-        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+        arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
@@ -78,9 +83,9 @@ configurations {
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    runtimeOnly "mezz.jei:jei-1.21-neoforge:19.0.0.5"
-    compileOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha"
-    runtimeOnly "appeng:appliedenergistics2-neoforge:19.0.4-alpha"
+    runtimeOnly "mezz.jei:jei-1.21.1-neoforge:19.21.0.247"
+    compileOnly "appeng:appliedenergistics2:19.1.2-beta"
+    runtimeOnly "appeng:appliedenergistics2:19.1.2-beta"
 }
 
 tasks.withType(ProcessResources).configureEach {
@@ -126,7 +131,7 @@ task publishCurseForge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge)
     mainFile.releaseType = 'release'
     mainFile.changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     mainFile.changelogType = 'markdown'
-    mainFile.gameVersions = ['1.21']
+    mainFile.gameVersions = ['1.21.1']
     mainFile.addModLoader("neoforge")
     mainFile.displayName = "AEInfinityBooster ${version}"
 
@@ -139,9 +144,9 @@ modrinth {
     versionName = "AEInfinityBooster $version"
     changelog = 'A changelog can be found at https://github.com/Hexeption/AEInfinityBooster'
     uploadFile = jar
-    gameVersions = ["1.21"]
+    gameVersions = ["1.21.1"]
     loaders = ["neoforge"]
     dependencies {
-        required.version "ae2", "19.0.4-alpha"
+        required.version "ae2", "19.1.2-beta"
     }
 }

gradle.properties

@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.05.01
+neogradle.subsystems.parchment.minecraftVersion=1.21.1
+neogradle.subsystems.parchment.mappingsVersion=2024.11.17
 
-minecraft_version=1.21
-minecraft_version_range=[1.21,1.21.1)
+minecraft_version=1.21.1
+minecraft_version_range=[1.21.1]
 
-neo_version=21.0.18-beta
-neo_version_range=[21.0.0-beta,)
+neo_version=21.1.122
+neo_version_range=[21.1.122,)
 
 loader_version_range=[4,)
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -7,7 +7,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
 rootProject.name = 'AEInfinityBooster'

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21	2024-06-19T07:19:19.880141	Recipes
+// 1.21.1	2025-02-22T06:25:44.1978683	Recipes
 999f2de23df4045d930cc5c6f13e5e99cdbe8f1b data/aeinfinitybooster/advancement/recipes/misc/dimension_card.json
 67dfca204b213514d07f518b8ed53de18ad64a64 data/aeinfinitybooster/advancement/recipes/misc/infinity_card.json
 a8aaa987085afbbd29c17987057086df95515aa0 data/aeinfinitybooster/recipe/dimension_card.json

src/main/java/uk/co/hexeption/aeinfinitybooster/AEInfinityBooster.java

@@ -8,11 +8,15 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.neoforge.client.gui.ConfigurationScreen;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredItem;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import uk.co.hexeption.aeinfinitybooster.config.AEInfinityBoosterConfig;
 import uk.co.hexeption.aeinfinitybooster.setup.ModItems;
 import uk.co.hexeption.aeinfinitybooster.setup.Registration;
 
@@ -49,6 +53,9 @@ public AEInfinityBooster(IEventBus modEventBus, ModContainer modContainer) {
 
         Registration.register(modEventBus);
 
+        modContainer.registerConfig(ModConfig.Type.COMMON, AEInfinityBoosterConfig.CONFIG_SPEC);
+        modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
+
 
         CREATIVE_MODE_TAB.register(modEventBus);
 

src/main/java/uk/co/hexeption/aeinfinitybooster/config/AEInfinityBoosterConfig.java

@@ -0,0 +1,31 @@
+package uk.co.hexeption.aeinfinitybooster.config;
+
+import net.neoforged.neoforge.common.ModConfigSpec;
+import org.apache.commons.lang3.tuple.Pair;
+
+
+public class AEInfinityBoosterConfig {
+
+    public static final AEInfinityBoosterConfig CONFIG;
+    public static final ModConfigSpec CONFIG_SPEC;
+
+    public static ModConfigSpec.IntValue DIMENSION_CARD_DRAIN;
+    public static ModConfigSpec.IntValue INFINITY_CARD_DRAIN;
+
+    private AEInfinityBoosterConfig(ModConfigSpec.Builder builder) {
+        builder.push("general");
+        builder.comment("General settings for AEInfinityBooster");
+        DIMENSION_CARD_DRAIN = builder.comment("The amount of power the Dimension Card drains per tick")
+                .defineInRange("dimensionCardDrain", 100, 0, Integer.MAX_VALUE);
+        INFINITY_CARD_DRAIN = builder.comment("The amount of power the Infinity Card drains per tick")
+                .defineInRange("infinityCardDrain", 50, 0, Integer.MAX_VALUE);
+        builder.pop();
+    }
+
+    static {
+        Pair<AEInfinityBoosterConfig, ModConfigSpec> pair = new ModConfigSpec.Builder().configure(AEInfinityBoosterConfig::new);
+
+        CONFIG = pair.getLeft();
+        CONFIG_SPEC = pair.getRight();
+    }
+}

src/main/java/uk/co/hexeption/aeinfinitybooster/item/DimensionCard.java

@@ -1,9 +1,16 @@
 package uk.co.hexeption.aeinfinitybooster.item;
 
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.TextColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.TooltipFlag;
 import uk.co.hexeption.aeinfinitybooster.AEInfinityBooster;
 
+import java.util.List;
+
 /**
  * DimensionCard
  *
@@ -19,4 +26,10 @@ public DimensionCard() {
     public boolean isFoil(ItemStack p_41453_) {
         return true;
     }
+
+    @Override
+    public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
+        Style style = Style.EMPTY.withColor(ChatFormatting.DARK_GRAY).withItalic(true);
+        tooltipComponents.add(Component.translatable("item.aeinfinitybooster.dimension_card.tooltip").withStyle(style));
+    }
 }

src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessBlockEntity.java

@@ -2,6 +2,7 @@
 
 import appeng.api.inventories.InternalInventory;
 import appeng.blockentity.networking.WirelessAccessPointBlockEntity;
+import appeng.core.definitions.AEItems;
 import appeng.util.inv.AppEngInternalInventory;
 import appeng.util.inv.filter.IAEItemFilter;
 import net.minecraft.core.BlockPos;
@@ -14,6 +15,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import uk.co.hexeption.aeinfinitybooster.setup.ModItems;
 
 /**
  * MixinWirelessBlockEntity
@@ -36,7 +38,15 @@ public boolean allowExtract(InternalInventory inv, int slot, int amount) {
 
             @Override
             public boolean allowInsert(InternalInventory inv, int slot, ItemStack stack) {
-                return true;
+                if(AEItems.WIRELESS_BOOSTER.is(stack)) {
+                    return true;
+                }
+
+                if(stack.is(ModItems.DIMENSION_CARD.get()) || stack.is(ModItems.INFINITY_CARD.get())){
+                    return true;
+                }
+
+                return false;
             }
         });
     }

src/main/java/uk/co/hexeption/aeinfinitybooster/mixins/MixinWirelessMenu.java

@@ -8,6 +8,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import uk.co.hexeption.aeinfinitybooster.config.AEInfinityBoosterConfig;
 import uk.co.hexeption.aeinfinitybooster.setup.ModItems;
 
 /**
@@ -26,12 +27,22 @@ public abstract class MixinWirelessMenu {
     @Final
     private RestrictedInputSlot boosterSlot;
 
+    @Shadow protected abstract void setDrain(long drain);
+
     @Inject(method = "broadcastChanges", at = @At(value = "INVOKE", target = "Lappeng/menu/AEBaseMenu;broadcastChanges()V", shift = At.Shift.BEFORE))
     private void broadcastChanges(CallbackInfo ci) {
 
         if (this.boosterSlot.getItem().is(ModItems.INFINITY_CARD.get()) || this.boosterSlot.getItem().is(ModItems.DIMENSION_CARD.get())) {
             this.setRange(Long.MAX_VALUE);
         }
+
+        if (this.boosterSlot.getItem().is(ModItems.INFINITY_CARD.get())) {
+            this.setDrain((long) 100 * AEInfinityBoosterConfig.INFINITY_CARD_DRAIN.get());
+        }
+
+        if (this.boosterSlot.getItem().is(ModItems.DIMENSION_CARD.get())) {
+            this.setDrain((long) 100 * AEInfinityBoosterConfig.DIMENSION_CARD_DRAIN.get());
+        }
     }
 
 }