removed altar conduit power draw fix

(and the dependency on that mod)

CHANGELOG.md

@@ -1,6 +1,7 @@
 # devel
 
-
+* Removed Altar Conduit power draw fix for AE2, fixed in the mod itself.
+* Fixed (= removed) Vault Integrations dependency.
 
 # 3.11.0.1 (2023-07-13)
 

README.md

@@ -21,7 +21,6 @@ The mod is configured via a server configuration file. To change settings, do th
 * Fake players can put Vault Rocks on the Altar again.
 * Relic fragments \#5 are now equally as likely to drop as the others.
 * AE2 auto crafting no longer requires manually giving its fake player all research.
-* Altar Conduit now draws the correct amount of power when connected to AE2.
 
 ## Balance Changes
 

build.gradle

@@ -191,8 +191,8 @@ dependencies {
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
     implementation fg.deobf('curse.maven:vault-hunters-official-mod-458203:4641723')
-    implementation fg.deobf('curse.maven:vault-integrations-867003:4570137')
+    // implementation fg.deobf('curse.maven:vault-integrations-867003:4570137')
-    implementation fg.deobf("curse.maven:refined-storage-243076:3712882")
+    // implementation fg.deobf("curse.maven:refined-storage-243076:3712882")
     implementation fg.deobf('appeng:appliedenergistics2-forge:11.7.0')
 
     // Vault dependency

src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinAltarConduitNode.java

@@ -1,61 +0,0 @@
-/**
- * Copyright 2023 alterNERDtive.
- * 
- * This file is part of Vault Mod Tweaks.
- * 
- * Vault Mod Tweaks is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Vault Mod Tweaks is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with Vault Mod Tweaks.  If not, see <https://www.gnu.org/licenses/>.
- */
-package tv.alterNERD.VaultModTweaks.integration.mixin;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import iskallia.vaultintegrations.altar.AltarConduitNode;
-import iskallia.vaultintegrations.init.VIConfigs;
-import tv.alterNERD.VaultModTweaks.Configuration;
-import tv.alterNERD.VaultModTweaks.VaultModTweaks;
-import tv.alterNERD.VaultModTweaks.util.I18n;
-
-/**
- * Changes the {@link iskallia.vaultintegrations.altar.AltarConduitNode} class for
- * managing the Altar Conduit as a node in RS/AE networks.
- * 
- * Specifically, fixes the energy consumption when part of an AE2 grid.
- */
-@Mixin(AltarConduitNode.class)
-public class MixinAltarConduitNode {
-    /**
-     * Redirects the
-     * {@link iskallia.vaultintegrations.altar.AltarConduitNode#getEnergyUsage()}
-     * method to return a value in AE/t instead of RF/t. 1 AE = 2.5 RF.
-     * 
-     * @return Energy usage in AE/t instead of RF/t
-     */
-    @Redirect(
-        method = "setupAE",
-        at = @At(
-            value = "INVOKE",
-            target = "Liskallia/vaultintegrations/altar/AltarConduitNode;getEnergyUsage()I"
-        ),
-        remap = false
-    )
-    private int getEnergyUsageRedirect(AltarConduitNode that) {
-        int rfPerTick = (int)VIConfigs.ALTAR_CONDUIT.getRFUsagePerTick();
-        if (Configuration.VAULTAR_CONDUIT_FIX.get()) {
-            VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.conduit.energy"));
-            rfPerTick = rfPerTick*2/5;
-        }
-        return rfPerTick;
-    }
-}

src/main/resources/META-INF/mods.toml

@@ -38,10 +38,3 @@ There are some bug fixes and a lot of QoL and balance changes. See https://git.a
     versionRange="[1.18.2-3.11.0.2466]"
     ordering="AFTER"
     side="BOTH"
-
-[[dependencies.the_vault_tweaks]]
-    modId="vaultintegrations"
-    mandatory=true
-    versionRange="[1.18.2-1.0.10]"
-    ordering="AFTER"
-    side="BOTH"

src/main/resources/mixins.the_vault_tweaks.json

@@ -5,7 +5,6 @@
     "compatibilityLevel": "JAVA_17",
     "refmap": "mixins.the_vault_tweaks.refmap.json",
     "mixins": [
-        "MixinAltarConduitNode",
         "MixinCrystalBuddingConfig",
         "MixinEnchantmentEntry",
         "MixinExpertisesGuiConfig",