From 9344eeb0ca6acefa28cc50ff4f845caff1fa1387 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 26 Mar 2020 21:33:44 +0000 Subject: [PATCH] Support latest energy version --- build.gradle | 2 ++ src/main/java/techreborn/TechReborn.java | 3 --- .../blockentity/cable/CableBlockEntity.java | 21 +++++++++---------- src/main/resources/fabric.mod.json | 3 ++- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index c7ab25ad6..7f62b271f 100644 --- a/build.gradle +++ b/build.gradle @@ -89,6 +89,8 @@ dependencies { modRuntime ("com.jamieswhiteshirt:developer-mode:1.0.15") { transitive = false } + + modApi 'teamreborn:energy:0.1.0' } def optionalDependency(String dep) { diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 463318a02..19b0252b6 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -32,7 +32,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import reborncore.api.power.ItemPowerHolder; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; @@ -70,8 +69,6 @@ public class TechReborn implements ModInitializer { INSTANCE = this; new Configuration(TechRebornConfig.class, "techreborn"); - ItemPowerHolder.setup(); - // Done to force the class to load ModRecipes.GRINDER.getName(); diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index 115483e1b..00deca08b 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -24,10 +24,6 @@ package techreborn.blockentity.cable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -57,6 +53,10 @@ import techreborn.blocks.cable.CableBlock; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * Created by modmuss50 on 19/05/2017. */ @@ -66,7 +66,7 @@ public class CableBlockEntity extends BlockEntity private double energy = 0; private TRContent.Cables cableType = null; - private ArrayList sendingFace = new ArrayList<>(); + private ArrayList sendingFace = new ArrayList<>(); private BlockState cover = null; public CableBlockEntity() { @@ -143,17 +143,16 @@ public class CableBlockEntity extends BlockEntity ArrayList> acceptors = new ArrayList<>(); for (Direction face : Direction.values()) { - EnergySide side = EnergySide.fromMinecraft(face); BlockEntity blockEntity = world.getBlockEntity(pos.offset(face)); if (blockEntity != null && Energy.valid(blockEntity)) { - if (blockEntity instanceof CableBlockEntity && energy <= Energy.of(blockEntity).side(EnergySide.fromMinecraft(face)).getEnergy()) { + if (blockEntity instanceof CableBlockEntity && energy <= Energy.of(blockEntity).side(face).getEnergy()) { continue; } - if(Energy.of(blockEntity).side(EnergySide.fromMinecraft(face.getOpposite())).getMaxInput() > 0){ + if(Energy.of(blockEntity).side(face.getOpposite()).getMaxInput() > 0){ acceptors.add(Pair.of(blockEntity, face)); - if (!sendingFace.contains(side)) { - sendingFace.add(side); + if (!sendingFace.contains(face)) { + sendingFace.add(face); } } } @@ -166,7 +165,7 @@ public class CableBlockEntity extends BlockEntity acceptors.forEach(pair -> { Energy.of(this) - .into(Energy.of(pair.getLeft()).side(EnergySide.fromMinecraft(pair.getRight().getOpposite()))) + .into(Energy.of(pair.getLeft()).side(pair.getRight().getOpposite())) .move(); }); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 573632bdc..8ddcb8d32 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,8 @@ "depends": { "fabricloader": ">=0.6.3", "fabric": "*", - "reborncore": "*" + "reborncore": "*", + "team_reborn_energy": ">=0.1.0" }, "authors": [ "Team Reborn",