Skip to content

Commit 7df9696

Browse files
falseresyncfalseresync
committed
Remove Reports system
1 parent 5899708 commit 7df9696

23 files changed

Lines changed: 66 additions & 240 deletions

‎src/main/java/falseresync/vivatech/client/wire/ClientWireManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package falseresync.vivatech.client.wire;
22

33
import falseresync.vivatech.common.power.wire.Wire;
4-
import falseresync.vivatech.network.c2s.RequestWiresC2SPayload;
4+
import falseresync.vivatech.network.c2s.RequestWiresChunksC2SPayload;
55
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
66
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
77
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
@@ -64,7 +64,7 @@ public static class Tracker {
6464

6565
public void sync() {
6666
if (!unsyncedChunks.isEmpty()) {
67-
ClientPlayNetworking.send(new RequestWiresC2SPayload(List.copyOf(unsyncedChunks)));
67+
ClientPlayNetworking.send(new RequestWiresChunksC2SPayload(List.copyOf(unsyncedChunks)));
6868
unsyncedChunks.clear();
6969
}
7070
}

src/main/java/falseresync/vivatech/network/report/ReportUtils.java renamed to src/main/java/falseresync/vivatech/common/Reports.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
1-
package falseresync.vivatech.network.report;
1+
package falseresync.vivatech.common;
22

3+
import net.minecraft.entity.player.PlayerEntity;
34
import net.minecraft.particle.ParticleEffect;
45
import net.minecraft.particle.ParticleTypes;
56
import net.minecraft.server.world.ServerWorld;
7+
import net.minecraft.sound.SoundCategory;
8+
import net.minecraft.text.Text;
9+
import net.minecraft.util.Formatting;
610
import net.minecraft.util.math.Vec3d;
711
import net.minecraft.world.World;
812

9-
public class ReportUtils {
10-
public static void addSparkles(World world, Vec3d pos) {
13+
public class Reports {
14+
public static void insufficientCharge(PlayerEntity player) {
15+
player.playSoundToPlayer(VivatechSounds.INSUFFICIENT_CHARGE, SoundCategory.PLAYERS, 1f, 1f);
16+
player.sendMessage(Text.translatable("hud.vivatech.gadget.insufficient_charge").formatted(Formatting.DARK_RED), true);
17+
}
18+
19+
private static void addSparkles(World world, Vec3d pos) {
1120
addParticle(world, ParticleTypes.FIREWORK, pos, 5, 10);
1221
}
1322

14-
public static void addSmoke(World world, Vec3d pos) {
23+
private static void addSmoke(World world, Vec3d pos) {
1524
addParticle(world, ParticleTypes.WHITE_SMOKE, pos, 5, 10);
1625
}
1726

18-
public static void addParticle(World world, ParticleEffect parameters, Vec3d pos, int minAmount, int maxAmount) {
27+
private static void addParticle(World world, ParticleEffect parameters, Vec3d pos, int minAmount, int maxAmount) {
1928
var random = world.getRandom();
2029
if (world instanceof ServerWorld serverWorld) {
2130
serverWorld.spawnParticles(

‎src/main/java/falseresync/vivatech/common/Vivatech.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@
1313
import falseresync.vivatech.common.item.VivatechItems;
1414
import falseresync.vivatech.common.item.focus.TransmutationFocusBehavior;
1515
import falseresync.vivatech.common.power.PowerSystem;
16-
import falseresync.vivatech.common.power.ServerGridsLoader;
1716
import falseresync.vivatech.common.power.wire.WireType;
1817
import falseresync.vivatech.network.VivatechNetworking;
1918
import falseresync.vivatech.network.VivatechServerReceivers;
20-
import falseresync.vivatech.network.report.Reports;
2119
import me.shedaniel.autoconfig.AutoConfig;
2220
import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
2321
import net.fabricmc.api.ModInitializer;
2422
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
25-
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
26-
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
2723
import net.minecraft.registry.Registries;
2824
import net.minecraft.util.Identifier;
2925
import org.slf4j.LoggerFactory;
@@ -67,7 +63,6 @@ public void onInitialize() {
6763
.link(Registries.DATA_COMPONENT_TYPE, VivatechComponents.class)
6864
.link(Registries.ENTITY_TYPE, VivatechEntities.class)
6965
.link(Registries.PARTICLE_TYPE, VivatechParticleTypes.class)
70-
.link(Reports.REGISTRY, Reports.class)
7166
.link(WireType.REGISTRY, WireType.class);
7267
VivatechAttachments.init();
7368
VivatechSounds.init();

‎src/main/java/falseresync/vivatech/common/VivatechSounds.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class VivatechSounds {
1010
public static final SoundEvent STAR_PROJECTILE_EXPLODE = r("entity.star_projectile.explode");
1111
public static final SoundEvent COMET_WARP_ANCHOR_PLACED = r("focus.comet_warp.anchor_placed");
12-
public static final SoundEvent SUCCESSFULLY_CHARGED = r("focus.charging.successfully_charged");
12+
public static final SoundEvent INSUFFICIENT_CHARGE = r("item.gadget.insufficient_charge");
1313

1414
private static SoundEvent r(String id) {
1515
var fullId = vtId(id);

‎src/main/java/falseresync/vivatech/common/item/focus/CometWarpFocusItem.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package falseresync.vivatech.common.item.focus;
22

33
import falseresync.vivatech.common.Vivatech;
4+
import falseresync.vivatech.common.VivatechSounds;
45
import falseresync.vivatech.common.data.VivatechComponents;
5-
import falseresync.vivatech.network.report.Reports;
6+
import falseresync.vivatech.common.Reports;
67
import net.minecraft.entity.EquipmentSlot;
78
import net.minecraft.entity.player.PlayerEntity;
89
import net.minecraft.item.ItemStack;
910
import net.minecraft.item.tooltip.TooltipType;
1011
import net.minecraft.server.network.ServerPlayerEntity;
1112
import net.minecraft.server.world.ServerWorld;
13+
import net.minecraft.sound.SoundCategory;
14+
import net.minecraft.sound.SoundEvents;
1215
import net.minecraft.text.Text;
1316
import net.minecraft.util.Formatting;
1417
import net.minecraft.util.Hand;
@@ -48,11 +51,11 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
4851
if (user instanceof ServerPlayerEntity player) {
4952
if (user.isSneaking()) {
5053
if (!Vivatech.getChargeManager().tryExpendGadgetCharge(gadgetStack, DEFAULT_PLACEMENT_COST, user)) {
51-
Reports.GADGET_INSUFFICIENT_CHARGE.sendTo(player);
54+
Reports.insufficientCharge(player);
5255
return TypedActionResult.fail(gadgetStack);
5356
}
5457

55-
Reports.COMET_WARP_ANCHOR_PLACED.sendTo(player);
58+
player.playSoundToPlayer(VivatechSounds.COMET_WARP_ANCHOR_PLACED, SoundCategory.PLAYERS, 1f, 1f);
5659
var globalPos = GlobalPos.create(world.getRegistryKey(), user.getBlockPos());
5760
gadgetStack.set(VivatechComponents.WARP_FOCUS_ANCHOR, globalPos);
5861
if (world.random.nextFloat() < 0.1f) {
@@ -61,7 +64,8 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
6164
} else {
6265
var anchor = gadgetStack.get(VivatechComponents.WARP_FOCUS_ANCHOR);
6366
if (anchor == null) {
64-
Reports.COMET_WARP_NO_ANCHOR.sendTo(player);
67+
player.playSoundToPlayer(SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 1f, 1f);
68+
player.sendMessage(Text.translatable("hud.vivatech.focus.comet_warp.no_anchor"), false);
6569
return TypedActionResult.fail(gadgetStack);
6670
}
6771

@@ -74,11 +78,11 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
7478
? DEFAULT_INTERDIMENSIONAL_COST
7579
: DEFAULT_WARPING_COST;
7680
if (!Vivatech.getChargeManager().tryExpendGadgetCharge(gadgetStack, warpingCost, user)) {
77-
Reports.GADGET_INSUFFICIENT_CHARGE.sendTo(player);
81+
Reports.insufficientCharge(player);
7882
return TypedActionResult.fail(gadgetStack);
7983
}
8084

81-
Reports.COMET_WARP_TELEPORTED.sendTo(player);
85+
player.playSoundToPlayer(SoundEvents.ENTITY_PLAYER_TELEPORT, SoundCategory.PLAYERS, 1f, 1f);
8286
user.teleportTo(new TeleportTarget(destination, anchor.pos().toCenterPos(), Vec3d.ZERO, user.getYaw(), user.getPitch(), TeleportTarget.NO_OP));
8387
gadgetStack.remove(VivatechComponents.WARP_FOCUS_ANCHOR);
8488
focusStack.damage(1, player, EquipmentSlot.MAINHAND);

‎src/main/java/falseresync/vivatech/common/item/focus/EnergyVeilFocusItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import falseresync.vivatech.common.data.VivatechComponents;
99
import falseresync.vivatech.common.entity.EnergyVeilEntity;
1010
import falseresync.vivatech.common.world.VivatechWorld;
11-
import falseresync.vivatech.network.report.Reports;
11+
import falseresync.vivatech.common.Reports;
1212
import net.minecraft.entity.*;
1313
import net.minecraft.entity.player.PlayerEntity;
1414
import net.minecraft.item.ItemStack;
@@ -63,7 +63,7 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
6363
return TypedActionResult.success(gadgetStack);
6464
}
6565

66-
Reports.GADGET_INSUFFICIENT_CHARGE.sendTo(player);
66+
Reports.insufficientCharge(player);
6767
return TypedActionResult.fail(gadgetStack);
6868
}
6969
return TypedActionResult.pass(gadgetStack);

‎src/main/java/falseresync/vivatech/common/item/focus/LightningFocusItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import falseresync.vivatech.common.Vivatech;
44
import falseresync.vivatech.common.VivatechUtil;
55
import falseresync.vivatech.common.data.VivatechAttachments;
6-
import falseresync.vivatech.network.report.Reports;
6+
import falseresync.vivatech.common.Reports;
77
import net.minecraft.entity.EntityType;
88
import net.minecraft.entity.EquipmentSlot;
99
import net.minecraft.entity.player.PlayerEntity;
@@ -43,7 +43,7 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
4343
return TypedActionResult.success(gadgetStack);
4444
}
4545

46-
Reports.GADGET_INSUFFICIENT_CHARGE.sendTo(player);
46+
Reports.insufficientCharge(player);
4747
return TypedActionResult.fail(gadgetStack);
4848
}
4949

‎src/main/java/falseresync/vivatech/common/item/focus/StarshooterFocusItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import falseresync.vivatech.common.Vivatech;
44
import falseresync.vivatech.common.entity.StarProjectileEntity;
5-
import falseresync.vivatech.network.report.Reports;
5+
import falseresync.vivatech.common.Reports;
66
import net.minecraft.entity.EquipmentSlot;
77
import net.minecraft.entity.player.PlayerEntity;
88
import net.minecraft.item.ItemStack;
@@ -25,7 +25,7 @@ public TypedActionResult<ItemStack> focusUse(ItemStack gadgetStack, ItemStack fo
2525
return TypedActionResult.success(gadgetStack);
2626
}
2727

28-
Reports.GADGET_INSUFFICIENT_CHARGE.sendTo(player);
28+
Reports.insufficientCharge(player);
2929
return TypedActionResult.fail(gadgetStack);
3030
}
3131

‎src/main/java/falseresync/vivatech/network/VivatechClientReceivers.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package falseresync.vivatech.network;
22

33
import falseresync.vivatech.client.VivatechClient;
4-
import falseresync.vivatech.network.s2c.MultiplayerReportS2CPayload;
5-
import falseresync.vivatech.network.s2c.ReportS2CPayload;
64
import falseresync.vivatech.network.s2c.WiresS2CPayload;
75
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
86

97
public class VivatechClientReceivers {
108
public static void registerAll() {
119
ClientPlayNetworking.registerGlobalReceiver(WiresS2CPayload.Added.ID, VivatechClientReceivers::onWiresAdded);
1210
ClientPlayNetworking.registerGlobalReceiver(WiresS2CPayload.Removed.ID, VivatechClientReceivers::onWiresRemoved);
13-
ClientPlayNetworking.registerGlobalReceiver(ReportS2CPayload.ID, VivatechClientReceivers::triggerReport);
14-
ClientPlayNetworking.registerGlobalReceiver(MultiplayerReportS2CPayload.ID, VivatechClientReceivers::triggerMultiplayerReport);
1511
}
1612

1713
private static void onWiresAdded(WiresS2CPayload.Added payload, ClientPlayNetworking.Context context) {
@@ -21,12 +17,4 @@ private static void onWiresAdded(WiresS2CPayload.Added payload, ClientPlayNetwor
2117
private static void onWiresRemoved(WiresS2CPayload.Removed payload, ClientPlayNetworking.Context context) {
2218
VivatechClient.getClientWireManager().removeWires(context.player().getWorld().getRegistryKey(), payload.wires());
2319
}
24-
25-
private static void triggerReport(ReportS2CPayload payload, ClientPlayNetworking.Context context) {
26-
payload.report().executeOnClient(context.player());
27-
}
28-
29-
private static void triggerMultiplayerReport(MultiplayerReportS2CPayload payload, ClientPlayNetworking.Context context) {
30-
payload.report().executeOnNearbyClients(context.player());
31-
}
3220
}

‎src/main/java/falseresync/vivatech/network/VivatechNetworking.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package falseresync.vivatech.network;
22

33
import falseresync.vivatech.network.c2s.ChangeFocusC2SPayload;
4-
import falseresync.vivatech.network.c2s.RequestWiresC2SPayload;
5-
import falseresync.vivatech.network.s2c.MultiplayerReportS2CPayload;
6-
import falseresync.vivatech.network.s2c.ReportS2CPayload;
4+
import falseresync.vivatech.network.c2s.RequestWiresChunksC2SPayload;
75
import falseresync.vivatech.network.s2c.WiresS2CPayload;
86
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
97

108
public class VivatechNetworking {
119
public static void registerAll() {
1210
PayloadTypeRegistry.playS2C().register(WiresS2CPayload.Added.ID, WiresS2CPayload.Added.PACKET_CODEC);
1311
PayloadTypeRegistry.playS2C().register(WiresS2CPayload.Removed.ID, WiresS2CPayload.Removed.PACKET_CODEC);
14-
PayloadTypeRegistry.playS2C().register(ReportS2CPayload.ID, ReportS2CPayload.PACKET_CODEC);
15-
PayloadTypeRegistry.playS2C().register(MultiplayerReportS2CPayload.ID, MultiplayerReportS2CPayload.PACKET_CODEC);
1612

17-
PayloadTypeRegistry.playC2S().register(RequestWiresC2SPayload.ID, RequestWiresC2SPayload.PACKET_CODEC);
13+
PayloadTypeRegistry.playC2S().register(RequestWiresChunksC2SPayload.ID, RequestWiresChunksC2SPayload.PACKET_CODEC);
1814
PayloadTypeRegistry.playC2S().register(ChangeFocusC2SPayload.ID, ChangeFocusC2SPayload.PACKET_CODEC);
1915
}
2016
}

0 commit comments

Comments
 (0)