Stop relying on TrackedData for lightning focus; begin working on Contactor

falseresync · falseresync · commit b963bfbc2c1f · 2025-03-16T00:27:00.000+03:00
diff --git a/gradle.properties b/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.19
+mod_version=1.0.0-alpha.20
 maven_group=falseresync.vivatech
 archives_base_name=vivatech
 
diff --git a/src/main/java/falseresync/vivatech/common/block/ContactorBlock.java b/src/main/java/falseresync/vivatech/common/block/ContactorBlock.java
@@ -0,0 +1,34 @@
+package falseresync.vivatech.common.block;
+
+import com.mojang.serialization.MapCodec;
+import falseresync.vivatech.common.blockentity.ContactorBlockEntity;
+import net.minecraft.block.BlockRenderType;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockWithEntity;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import org.jetbrains.annotations.Nullable;
+
+public class ContactorBlock extends BlockWithEntity {
+    public static final MapCodec<ContactorBlock> CODEC = createCodec(ContactorBlock::new);
+
+    protected ContactorBlock(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    protected MapCodec<ContactorBlock> getCodec() {
+        return CODEC;
+    }
+
+    @Nullable
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return new ContactorBlockEntity(pos, state);
+    }
+
+    @Override
+    protected BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+}
diff --git a/src/main/java/falseresync/vivatech/common/block/VivatechBlocks.java b/src/main/java/falseresync/vivatech/common/block/VivatechBlocks.java
@@ -16,9 +16,11 @@ public class VivatechBlocks {
     public static final WindTurbineBlock WIND_TURBINE = r("wind_turbine", WindTurbineBlock::new, AbstractBlock.Settings.copy(Blocks.CAULDRON));
 
     public static final HeaterBlock HEATER = r("heater", HeaterBlock::new, AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK));
-    public static final StaticCompensatorBlock STATIC_COMPENSATOR = r("static_compensator", StaticCompensatorBlock::new, AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK));
     public static final ChargerBlock CHARGER = r("charger", ChargerBlock::new, AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK));
 
+    public static final StaticCompensatorBlock STATIC_COMPENSATOR = r("static_compensator", StaticCompensatorBlock::new, AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK));
+    public static final StaticCompensatorBlock CONTACTOR = r("contactor", StaticCompensatorBlock::new, AbstractBlock.Settings.copy(Blocks.COPPER_BLOCK));
+
     public static final WirePostBlock WIRE_POST = r("wire_post", WirePostBlock::new, AbstractBlock.Settings.copy(Blocks.LIGHTNING_ROD));
 
     private static <T extends Block> T r(String id, Function<AbstractBlock.Settings, T> block, AbstractBlock.Settings settings) {
diff --git a/src/main/java/falseresync/vivatech/common/block/WirePostBlock.java b/src/main/java/falseresync/vivatech/common/block/WirePostBlock.java
@@ -82,7 +82,8 @@ protected BlockState mirror(BlockState state, BlockMirror mirror) {
 
     @Override
     public GridVertex getGridVertex(World world, BlockPos pos, BlockState state) {
-        return new GridVertex(pos, PowerSystem.APPLIANCE.find(world, pos.offset(state.get(FACING)), null));
+        var facing = state.get(FACING);
+        return new GridVertex(pos, PowerSystem.APPLIANCE.find(world, pos.offset(facing), facing));
     }
 
     @Override
diff --git a/src/main/java/falseresync/vivatech/common/blockentity/ContactorBlockEntity.java b/src/main/java/falseresync/vivatech/common/blockentity/ContactorBlockEntity.java
@@ -0,0 +1,27 @@
+package falseresync.vivatech.common.blockentity;
+
+import falseresync.vivatech.common.power.Appliance;
+import falseresync.vivatech.common.power.ApplianceProvider;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import org.jetbrains.annotations.Nullable;
+
+public class ContactorBlockEntity extends BlockEntity implements ApplianceProvider {
+    private final Appliance applianceA = new Appliance() {
+        @Override
+        public BlockPos getAppliancePos() {
+            return null;
+        }
+    };
+
+    public ContactorBlockEntity(BlockPos pos, BlockState state) {
+        super(VivatechBlockEntities.CONTACTOR, pos, state);
+    }
+
+    @Override
+    public Appliance getAppliance(@Nullable Direction side) {
+        return null;
+    }
+}
diff --git a/src/main/java/falseresync/vivatech/common/blockentity/VivatechBlockEntities.java b/src/main/java/falseresync/vivatech/common/blockentity/VivatechBlockEntities.java
@@ -12,8 +12,11 @@ public class VivatechBlockEntities {
 
     public static final @RegistryObject BlockEntityType<HeaterBlockEntity> HEATER =
             BlockEntityType.Builder.create(HeaterBlockEntity::new, VivatechBlocks.HEATER).build();
-    public static final @RegistryObject BlockEntityType<StaticCompensatorBlockEntity> STATIC_COMPENSATOR =
-            BlockEntityType.Builder.create(StaticCompensatorBlockEntity::new, VivatechBlocks.STATIC_COMPENSATOR).build();
     public static final @RegistryObject BlockEntityType<ChargerBlockEntity> CHARGER =
             BlockEntityType.Builder.create(ChargerBlockEntity::new, VivatechBlocks.CHARGER).build();
+
+    public static final @RegistryObject BlockEntityType<StaticCompensatorBlockEntity> STATIC_COMPENSATOR =
+            BlockEntityType.Builder.create(StaticCompensatorBlockEntity::new, VivatechBlocks.STATIC_COMPENSATOR).build();
+    public static final @RegistryObject BlockEntityType<ContactorBlockEntity> CONTACTOR =
+            BlockEntityType.Builder.create(ContactorBlockEntity::new, VivatechBlocks.CONTACTOR).build();
 }
diff --git a/src/main/java/falseresync/vivatech/common/data/VivatechAttachments.java b/src/main/java/falseresync/vivatech/common/data/VivatechAttachments.java
@@ -12,6 +12,9 @@ public class VivatechAttachments {
     public static final AttachmentType<Boolean> HAS_INSPECTOR_GOGGLES = AttachmentRegistry.create(
             vtId("has_inspector_goggles"),
             builder -> builder.syncWith(PacketCodecs.BOOL, AttachmentSyncPredicate.targetOnly()).persistent(Codec.BOOL));
+    public static final AttachmentType<Boolean> THUNDERLESS_LIGHTNING = AttachmentRegistry.create(
+            vtId("has_inspector_goggles"),
+            builder -> builder.syncWith(PacketCodecs.BOOL, AttachmentSyncPredicate.all()));
     public static final AttachmentType<Integer> ENERGY_VEIL_NETWORK_ID = AttachmentRegistry.create(
             vtId("energy_veil_id"),
             builder -> builder.syncWith(PacketCodecs.INTEGER, AttachmentSyncPredicate.all()));
diff --git a/src/main/java/falseresync/vivatech/common/item/VivatechItemGroups.java b/src/main/java/falseresync/vivatech/common/item/VivatechItemGroups.java
@@ -17,13 +17,15 @@ public class VivatechItemGroups {
                         entries.add(VivatechItems.WIND_TURBINE);
 
                         entries.add(VivatechItems.HEATER);
-                        entries.add(VivatechItems.STATIC_COMPENSATOR);
                         entries.add(VivatechItems.CHARGER);
 
+                        entries.add(VivatechItems.STATIC_COMPENSATOR);
+                        entries.add(VivatechItems.CONTACTOR);
+
                         entries.add(VivatechItems.WIRE_POST);
 
-                        entries.add(VivatechItems.MORTAR_AND_PESTLE);
                         entries.add(VivatechItems.WIRE);
+                        entries.add(VivatechItems.MORTAR_AND_PESTLE);
                         entries.add(VivatechItems.PLIERS);
                         entries.add(VivatechItems.PROBE);
                         entries.add(VivatechItems.INSPECTOR_GOGGLES);
diff --git a/src/main/java/falseresync/vivatech/common/item/VivatechItems.java b/src/main/java/falseresync/vivatech/common/item/VivatechItems.java
@@ -22,13 +22,15 @@ public class VivatechItems {
     public static final BlockItem WIND_TURBINE = rBlockItem("wind_turbine", VivatechBlocks.WIND_TURBINE, new Item.Settings());
 
     public static final BlockItem HEATER = rBlockItem("heater", VivatechBlocks.HEATER, new Item.Settings());
-    public static final BlockItem STATIC_COMPENSATOR = rBlockItem("static_compensator", VivatechBlocks.STATIC_COMPENSATOR, new Item.Settings());
     public static final BlockItem CHARGER = rBlockItem("charger", VivatechBlocks.CHARGER, new Item.Settings());
 
+    public static final BlockItem STATIC_COMPENSATOR = rBlockItem("static_compensator", VivatechBlocks.STATIC_COMPENSATOR, new Item.Settings());
+    public static final BlockItem CONTACTOR = rBlockItem("contactor", VivatechBlocks.CONTACTOR, new Item.Settings());
+
     public static final BlockItem WIRE_POST = rBlockItem("wire_post", VivatechBlocks.WIRE_POST, new Item.Settings());
 
-    public static final MortarAndPestleItem MORTAR_AND_PESTLE = r("mortar_and_pestle", MortarAndPestleItem::new, new Item.Settings().maxCount(1).maxDamage(16));
     public static final WireItem WIRE = r("wire", WireItem::new, new Item.Settings());
+    public static final MortarAndPestleItem MORTAR_AND_PESTLE = r("mortar_and_pestle", MortarAndPestleItem::new, new Item.Settings().maxCount(1).maxDamage(16));
     public static final PliersItem PLIERS = r("pliers", PliersItem::new, new Item.Settings().maxCount(1));
     public static final ProbeItem PROBE = r("probe", ProbeItem::new, new Item.Settings().maxCount(1));
     public static final InspectorGogglesItem INSPECTOR_GOGGLES = r("inspector_goggles", InspectorGogglesItem::new, new Item.Settings().maxCount(1));
diff --git a/src/main/java/falseresync/vivatech/common/item/focus/LightningFocusItem.java b/src/main/java/falseresync/vivatech/common/item/focus/LightningFocusItem.java
@@ -2,6 +2,7 @@
 
 import falseresync.vivatech.common.Vivatech;
 import falseresync.vivatech.common.VivatechUtil;
+import falseresync.vivatech.common.data.VivatechAttachments;
 import falseresync.vivatech.network.report.Reports;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -36,7 +37,7 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
                 //noinspection DataFlowIssue
                 lightning.refreshPositionAfterTeleport(pos);
                 lightning.setChanneler(player);
-                ((VivatechLightning) lightning).vivatech$setThunderless();
+                lightning.setAttached(VivatechAttachments.THUNDERLESS_LIGHTNING, true);
                 world.spawnEntity(lightning);
                 focusStack.damage(1, user, EquipmentSlot.MAINHAND);
                 return TypedActionResult.success(gadgetStack);
@@ -55,8 +56,4 @@ protected Vec3d findGroundPos(ServerWorld world, Vec3d posInAir) {
                 world.getTopY(Heightmap.Type.MOTION_BLOCKING, (int) posInAir.x, (int) posInAir.z),
                 posInAir.z);
     }
-
-    public interface VivatechLightning {
-        void vivatech$setThunderless();
-    }
 }
diff --git a/src/main/java/falseresync/vivatech/common/mixin/LightningEntityMixin.java b/src/main/java/falseresync/vivatech/common/mixin/LightningEntityMixin.java
@@ -2,6 +2,7 @@
 
 import com.llamalad7.mixinextras.injector.v2.*;
 import com.llamalad7.mixinextras.injector.wrapoperation.*;
+import falseresync.vivatech.common.data.VivatechAttachments;
 import falseresync.vivatech.common.item.focus.LightningFocusItem;
 import falseresync.vivatech.common.item.focus.*;
 import net.minecraft.entity.*;
@@ -13,18 +14,15 @@
 import org.spongepowered.asm.mixin.injection.callback.*;
 
 @Mixin(LightningEntity.class)
-public abstract class LightningEntityMixin implements LightningFocusItem.VivatechLightning {
-    @Unique
-    private static final TrackedData<Boolean> THUNDERLESS = DataTracker.registerData(LightningEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
-
+public abstract class LightningEntityMixin {
     @WrapWithCondition(
             method = "tick",
             at = @At(
                     value = "INVOKE",
                     target = "Lnet/minecraft/world/World;playSound(DDDLnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FFZ)V",
                     ordinal = 0))
     private boolean vivatech$tick$removeThunder(World instance, double x, double y, double z, SoundEvent sound, SoundCategory category, float volume, float pitch, boolean useDistance) {
-        return !((LightningEntity) (Object) this).getDataTracker().get(THUNDERLESS);
+        return !((LightningEntity) (Object) this).hasAttached(VivatechAttachments.THUNDERLESS_LIGHTNING);
     }
 
     @WrapOperation(
@@ -34,21 +32,10 @@ public abstract class LightningEntityMixin implements LightningFocusItem.Vivatec
                     target = "Lnet/minecraft/world/World;playSound(DDDLnet/minecraft/sound/SoundEvent;Lnet/minecraft/sound/SoundCategory;FFZ)V",
                     ordinal = 1))
     private void vivatech$tick$changeSoundCategory(World instance, double x, double y, double z, SoundEvent sound, SoundCategory category, float volume, float pitch, boolean useDistance, Operation<Void> original) {
-        if (((LightningEntity) (Object) this).getDataTracker().get(THUNDERLESS)) {
+        if (((LightningEntity) (Object) this).hasAttached(VivatechAttachments.THUNDERLESS_LIGHTNING)) {
             original.call(instance, x, y, z, sound, SoundCategory.PLAYERS, 1.0f, pitch, true);
         } else {
             original.call(instance, x, y, z, sound, category, volume, pitch, useDistance);
         }
     }
-
-
-    @Inject(method = "initDataTracker", at = @At("TAIL"))
-    private void vivatech$initDataTracker(DataTracker.Builder builder, CallbackInfo ci) {
-        builder.add(THUNDERLESS, false);
-    }
-
-    @Override
-    public void vivatech$setThunderless() {
-        ((LightningEntity) (Object) this).getDataTracker().set(THUNDERLESS, true, true);
-    }
 }
diff --git a/src/main/java/falseresync/vivatech/common/power/ApplianceProvider.java b/src/main/java/falseresync/vivatech/common/power/ApplianceProvider.java
@@ -0,0 +1,9 @@
+package falseresync.vivatech.common.power;
+
+import net.minecraft.util.math.Direction;
+import org.jetbrains.annotations.Nullable;
+
+public interface ApplianceProvider {
+    @Nullable
+    Appliance getAppliance(@Nullable Direction side);
+}
diff --git a/src/main/java/falseresync/vivatech/common/power/PowerSystem.java b/src/main/java/falseresync/vivatech/common/power/PowerSystem.java
@@ -7,6 +7,7 @@
 import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 import java.util.Comparator;
@@ -16,7 +17,7 @@
 import static falseresync.vivatech.common.Vivatech.vtId;
 
 public class PowerSystem {
-    public static final BlockApiLookup<Appliance, Void> APPLIANCE = BlockApiLookup.get(vtId("appliance"), Appliance.class, Void.class);
+    public static final BlockApiLookup<Appliance, Direction> APPLIANCE = BlockApiLookup.get(vtId("appliance"), Appliance.class, Direction.class);
     public static final BlockApiLookup<GridVertex, Void> GRID_VERTEX = BlockApiLookup.get(vtId("grid_vertex"), GridVertex.class, Void.class);
     public static final WorldSavePath SAVE_PATH = new WorldSavePath("power_systems");
     public static final int DATA_VERSION = 100;
@@ -37,6 +38,14 @@ public static void registerAll() {
                 VivatechBlockEntities.STATIC_COMPENSATOR
         );
 
+        APPLIANCE.registerForBlocks((world, pos, state, blockEntity, context) -> {
+            if (world.getBlockEntity(pos) instanceof ApplianceProvider applianceProvider) {
+                return applianceProvider.getAppliance(context);
+            }
+
+            return null;
+        }, VivatechBlocks.CONTACTOR);
+
         GRID_VERTEX.registerForBlocks((world, pos, state, blockEntity, context) -> {
             if (state.getBlock() instanceof GridVertexProvider provider) {
                 return provider.getGridVertex(world, pos, state);

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ protected BlockState mirror(BlockState state, BlockMirror mirror) {`
`82`	`82`
`83`	`83`	`@Override`
`84`	`84`	`public GridVertex getGridVertex(World world, BlockPos pos, BlockState state) {`
`85`		`- return new GridVertex(pos, PowerSystem.APPLIANCE.find(world, pos.offset(state.get(FACING)), null));`
	`85`	`+ var facing = state.get(FACING);`
	`86`	`+ return new GridVertex(pos, PowerSystem.APPLIANCE.find(world, pos.offset(facing), facing));`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`@Override`