From 3c4be6a321baa2dcd93a7b21eddf53d6b0c22643 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Sat, 5 Feb 2022 13:58:26 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E2=9C=A8=20Battery=20upgrade?= =?UTF-8?q?=20now=20pushes=20energy=20to=20attached=20cables=20in=20additi?= =?UTF-8?q?on=20to=20allowing=20it=20to=20be=20pulled=20from=20the=20batte?= =?UTF-8?q?ry.=20Closes=20#406"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a27b434bcbc12504d3904a8fd7ea8933430c24c3. --- build.gradle | 5 +-- gradle.properties | 2 +- .../battery/BatteryUpgradeWrapper.java | 37 ------------------- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index 0801e1094..70d6ae009 100644 --- a/build.gradle +++ b/build.gradle @@ -111,8 +111,8 @@ dependencies { //runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") compileOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}") compileOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") - runtimeOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}") - runtimeOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") + //runtimeOnly fg.deobf("curse.maven:craftingtweaks-233071:${crafting_tweaks_cf_file_id}") + //runtimeOnly fg.deobf("curse.maven:balm-531761:${balm_cf_file_id}") //runtimeOnly fg.deobf("slimeknights.mantle:Mantle:1.16.5-1.6.115") //runtimeOnly fg.deobf("slimeknights.tconstruct:TConstruct:1.16.5-3.1.0.242") @@ -120,7 +120,6 @@ dependencies { //runtimeOnly fg.deobf("curse.maven:tetra-289712:3371803") //runtimeOnly fg.deobf("curse.maven:invtweaks-383070:3102237") //runtimeOnly fg.deobf("curse.maven:mekanism-268560:3206392") - runtimeOnly fg.deobf("curse.maven:immersiveengineering-231951:3587149") } test { diff --git a/gradle.properties b/gradle.properties index 340d5b73f..5929f00ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.daemon=false minecraft_version=1.18.1 forge_version=39.0.44 -mod_version=3.15.5 +mod_version=3.15.4 jei_mc_version=1.18.1 jei_version=9.1.0.+ curios_version=1.18-5.0.2.3 diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/battery/BatteryUpgradeWrapper.java b/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/battery/BatteryUpgradeWrapper.java index 88ef29652..2168da888 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/battery/BatteryUpgradeWrapper.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/battery/BatteryUpgradeWrapper.java @@ -1,7 +1,6 @@ package net.p3pp3rf1y.sophisticatedcore.upgrades.battery; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -15,11 +14,8 @@ import net.p3pp3rf1y.sophisticatedcore.upgrades.ITickableUpgrade; import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeWrapperBase; import net.p3pp3rf1y.sophisticatedcore.util.NBTHelper; -import net.p3pp3rf1y.sophisticatedcore.util.WorldHelper; import javax.annotation.Nullable; -import java.util.HashSet; -import java.util.Set; import java.util.function.Consumer; public class BatteryUpgradeWrapper extends UpgradeWrapperBase @@ -27,13 +23,9 @@ public class BatteryUpgradeWrapper extends UpgradeWrapperBase updateTankRenderInfoCallback; private final ItemStackHandler inventory; private int energyStored; - private final Set energyStorageDirections = new HashSet<>(); - private long nextCacheTime = 0; protected BatteryUpgradeWrapper(IStorageWrapper storageWrapper, ItemStack upgrade, Consumer upgradeSaveHandler) { super(storageWrapper, upgrade, upgradeSaveHandler); @@ -159,39 +151,10 @@ public void tick(@Nullable LivingEntity entity, Level world, BlockPos pos) { if (energyStored > 0) { inventory.getStackInSlot(OUTPUT_SLOT).getCapability(CapabilityEnergy.ENERGY).ifPresent(this::extractToStorage); - - if (entity == null) { - transferToAttachedEnergyStorage(world, pos); - } - } - } - - private void transferToAttachedEnergyStorage(Level world, BlockPos pos) { - if (nextCacheTime <= world.getGameTime()) { - nextCacheTime = world.getGameTime() + CACHE_COOLDOWN; - energyStorageDirections.clear(); - for (Direction dir : Direction.values()) { - BlockPos offsetPos = pos.offset(dir.getNormal()); - WorldHelper.getBlockEntity(world, offsetPos).ifPresent(be -> be.getCapability(CapabilityEnergy.ENERGY, dir.getOpposite()) - .ifPresent(energyStorage -> { - energyStorageDirections.add(dir); - extractToStorage(energyStorage); - })); - } - } else { - for (Direction dir : energyStorageDirections) { - BlockPos offsetPos = pos.offset(dir.getNormal()); - WorldHelper.getBlockEntity(world, offsetPos).ifPresent(be -> be.getCapability(CapabilityEnergy.ENERGY, dir.getOpposite()) - .ifPresent(this::extractToStorage)); - } } } private void extractToStorage(IEnergyStorage energyStorage) { - if (!energyStorage.canReceive()) { - return; - } - int toExtract = innerExtractEnergy(getMaxInOut(), true); if (toExtract > 0) { toExtract = energyStorage.receiveEnergy(toExtract, true);