Fix crashes due to conflict in method resolution I assume; fix Charger flickering

Author: falseresync

gradle.properties

@@ -7,7 +7,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.10
 fabric_version=0.115.1+1.21.1
 
-mod_version=1.0.0-alpha.17
+mod_version=1.0.0-alpha.18
 maven_group=falseresync.vivatech
 archives_base_name=vivatech
 

src/main/generated/data/vivatech/tags/item/chargeable.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "vivatech:gadget"
+  ]
+}

src/main/java/falseresync/vivatech/common/blockentity/BaseAppliance.java

@@ -18,6 +18,11 @@ public BaseAppliance(BlockEntityType<?> type, BlockPos pos, BlockState state) {
         super(type, pos, state);
     }
 
+    @Override
+    public BlockPos getAppliancePos() {
+        return getPos();
+    }
+
     @Override
     public void onGridConnected() {
         connected = true;

src/main/java/falseresync/vivatech/common/blockentity/ChargerBlockEntity.java

@@ -1,11 +1,9 @@
 package falseresync.vivatech.common.blockentity;
 
 import falseresync.vivatech.common.Vivatech;
-import falseresync.vivatech.common.item.VivatechItems;
-import falseresync.vivatech.common.power.Appliance;
+import falseresync.vivatech.common.item.VivatechItemTags;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
@@ -14,21 +12,19 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkSectionPos;
 import org.jetbrains.annotations.Nullable;
 
-public class ChargerBlockEntity extends BlockEntity implements Ticking, Appliance {
+public class ChargerBlockEntity extends BaseAppliance implements Ticking {
     protected ItemStack stack = ItemStack.EMPTY;
-    protected boolean connected = false;
-    protected boolean operational = false;
+    protected boolean canCharge = false;
+    protected boolean couldChargeLastTick = false;
     protected boolean charging = false;
-    protected int gridCheckCooldown = 0;
 
     public ChargerBlockEntity(BlockPos pos, BlockState state) {
         super(VivatechBlockEntities.CHARGER, pos, state);
+        setAcceptableVoltage(220, 240);
     }
 
     @Override
@@ -37,52 +33,30 @@ public void tick() {
             return;
         }
 
-        if (operational) {
-            if (Vivatech.getChargeManager().isGadgetFullyCharged(stack)) {
-                if (charging) {
-                    charging = false;
+        canCharge = isOperational() && !Vivatech.getChargeManager().isGadgetFullyCharged(stack);
+
+        if (canCharge) {
+            if (couldChargeLastTick) {
+                if (!charging) {
+                    charging = true;
                     markDirty();
                 }
-                return;
-            }
 
-            if (!charging) {
-                charging = true;
+                Vivatech.getChargeManager().charge(stack, 1, null);
+            }
+        } else {
+            if (charging) {
+                charging = false;
                 markDirty();
             }
-
-            Vivatech.getChargeManager().charge(stack, 1, null);
         }
-    }
 
-    @Override
-    public void onGridConnected() {
-        connected = true;
-    }
-
-    @Override
-    public void onGridDisconnected() {
-        connected = false;
-    }
-
-    @Override
-    public void onGridFrozen() {
-        operational = false;
+        couldChargeLastTick = canCharge;
     }
 
     @Override
     public float getElectricalCurrent() {
-        return charging ? - 0.5f : 0;
-    }
-
-    @Override
-    public void gridTick(float voltage) {
-        if (connected && gridCheckCooldown == 0) {
-            operational = voltage > 210 && voltage < 250;
-            gridCheckCooldown = 10;
-        } else if (gridCheckCooldown > 0) {
-            gridCheckCooldown -= 1;
-        }
+        return canCharge ? -0.5f : 0;
     }
 
     public ItemStack getStackCopy() {
@@ -95,7 +69,7 @@ public boolean isCharging() {
 
     public void exchangeOrDrop(PlayerEntity player, Hand hand) {
         var stackInHand = player.getStackInHand(hand);
-        if (stackInHand.isOf(VivatechItems.GADGET) || stackInHand.isEmpty()) {
+        if (stackInHand.isIn(VivatechItemTags.CHARGEABLE) || stackInHand.isEmpty()) {
             player.setStackInHand(hand, stack);
             stack = stackInHand;
         } else {

src/main/java/falseresync/vivatech/common/blockentity/GeneratorBlockEntity.java

@@ -7,9 +7,8 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 
-public class GeneratorBlockEntity extends BlockEntity implements Ticking, Appliance {
+public class GeneratorBlockEntity extends BaseAppliance implements Ticking {
     private boolean generating = true;
-    private boolean connected = false;
 
     public GeneratorBlockEntity(BlockPos pos, BlockState state) {
         super(VivatechBlockEntities.GENERATOR, pos, state);
@@ -21,27 +20,17 @@ public void tick() {
             return;
         }
 
-        if (connected) {
+        if (isConnected()) {
             var facing = getCachedState().get(GearboxBlock.FACING);
             var gearboxState = world.getBlockState(pos.offset(facing));
             var wind_turbineState = world.getBlockState(pos.offset(facing, 2));
             generating = gearboxState.isOf(VivatechBlocks.GEARBOX) && wind_turbineState.isOf(VivatechBlocks.WIND_TURBINE);
+        } else if (generating) {
+            generating = false;
         }
     }
-
     @Override
     public float getElectricalCurrent() {
         return generating ? 2 : 0;
     }
-
-    @Override
-    public void onGridConnected() {
-        connected = true;
-    }
-
-    @Override
-    public void onGridDisconnected() {
-        connected = false;
-        generating = false;
-    }
 }

src/main/java/falseresync/vivatech/common/blockentity/StaticCompensatorBlockEntity.java

@@ -5,7 +5,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 
-public class StaticCompensatorBlockEntity extends BlockEntity implements Ticking, Appliance {
+public class StaticCompensatorBlockEntity extends BaseAppliance implements Ticking {
     public StaticCompensatorBlockEntity(BlockPos pos, BlockState state) {
         super(VivatechBlockEntities.STATIC_COMPENSATOR, pos, state);
     }

src/main/java/falseresync/vivatech/common/item/VivatechItemTags.java

@@ -9,6 +9,7 @@
 public class VivatechItemTags {
     public static final TagKey<Item> FOCUSES = TagKey.of(RegistryKeys.ITEM, vtId("focuses"));
     public static final TagKey<Item> GADGETS = TagKey.of(RegistryKeys.ITEM, vtId("gadgets"));
+    public static final TagKey<Item> CHARGEABLE = TagKey.of(RegistryKeys.ITEM, vtId("chargeable"));
 
     public static void init() {
     }

src/main/java/falseresync/vivatech/common/power/Appliance.java

@@ -6,7 +6,7 @@ public interface Appliance {
     /**
      * Must not change
      */
-    BlockPos getPos();
+    BlockPos getAppliancePos();
 
     /**
      * Only called when first connected. <br/>

src/main/java/falseresync/vivatech/common/power/Grid.java

@@ -173,21 +173,21 @@ private void onVertexAdded(GridVertex vertex, boolean shouldInitialize) {
         if (vertex.appliance() != null) {
             if (!appliances.containsValue(vertex.appliance())) {
                 onApplianceAdded(vertex.appliance(), shouldInitialize);
-                var appliancePos = vertex.appliance().getPos();
+                var appliancePos = vertex.appliance().getAppliancePos();
                 trackedChunks.computeIfAbsent(new ChunkPos(appliancePos), key -> new ObjectOpenHashSet<>()).add(appliancePos);
             }
         }
     }
 
     private void onApplianceAdded(Appliance appliance, boolean shouldInitialize) {
-        appliances.put(appliance.getPos(), appliance);
+        appliances.put(appliance.getAppliancePos(), appliance);
         if (shouldInitialize) {
             appliance.onGridConnected();
         }
     }
 
     private void onVertexRemoved(GridVertex vertex, boolean removeGridIfEmpty) {
-        onVertexRemoved(vertex.pos(), vertex.appliance() != null ? vertex.appliance().getPos() : null, removeGridIfEmpty);
+        onVertexRemoved(vertex.pos(), vertex.appliance() != null ? vertex.appliance().getAppliancePos() : null, removeGridIfEmpty);
     }
 
     private void onVertexRemoved(BlockPos pos, @Nullable BlockPos appliancePos, boolean removeGridIfEmpty) {
@@ -271,7 +271,7 @@ private void refreshApplianceReferences() {
         var appliancesToUpdate = new ObjectOpenHashSet<ReferenceObjectPair<Appliance, GridVertex>>();
         for (GridVertex oldVertex : graph.vertexSet()) {
             if (oldVertex.appliance() != null) {
-                var appliance = PowerSystem.APPLIANCE.find(world, oldVertex.appliance().getPos(), null);
+                var appliance = PowerSystem.APPLIANCE.find(world, oldVertex.appliance().getAppliancePos(), null);
                 appliancesToUpdate.add(ReferenceObjectPair.of(appliance, oldVertex));
             }
         }

src/main/java/falseresync/vivatech/datagen/VivatechItemTagProvider.java

@@ -18,6 +18,7 @@ public VivatechItemTagProvider(FabricDataOutput output, CompletableFuture<Regist
     protected void configure(RegistryWrapper.WrapperLookup arg) {
         getOrCreateTagBuilder(VivatechItemTags.FOCUSES).add(FOCUSES);
         getOrCreateTagBuilder(VivatechItemTags.GADGETS).add(VivatechItems.GADGET);
+        getOrCreateTagBuilder(VivatechItemTags.CHARGEABLE).add(VivatechItems.GADGET);
     }
 
     public static final Item[] FOCUSES = new Item[] {