From 762a997dac7157ce8ff8960d3bd79f4dd2aee1ea Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 7 Sep 2024 04:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4worlddata=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mcreator/superbwarfare/ModUtils.java | 4 ++++ .../superbwarfare/network/ModVariables.java | 17 +++-------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/ModUtils.java b/src/main/java/net/mcreator/superbwarfare/ModUtils.java index 4faf39aeb..42fc80498 100644 --- a/src/main/java/net/mcreator/superbwarfare/ModUtils.java +++ b/src/main/java/net/mcreator/superbwarfare/ModUtils.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare; import net.mcreator.superbwarfare.init.*; +import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.network.message.*; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -112,6 +113,9 @@ public class ModUtils { addNetworkMessage(GunReforgeMessage.class, GunReforgeMessage::encode, GunReforgeMessage::decode, GunReforgeMessage::handler); addNetworkMessage(SetPerkLevelMessage.class, SetPerkLevelMessage::encode, SetPerkLevelMessage::decode, SetPerkLevelMessage::handler); addNetworkMessage(BreathMessage.class, BreathMessage::encode, BreathMessage::decode, BreathMessage::handler); + addNetworkMessage(ModVariables.SavedDataSyncMessage.class, ModVariables.SavedDataSyncMessage::buffer, ModVariables.SavedDataSyncMessage::new, ModVariables.SavedDataSyncMessage::handler); + addNetworkMessage(ModVariables.PlayerVariablesSyncMessage.class, ModVariables.PlayerVariablesSyncMessage::buffer, ModVariables.PlayerVariablesSyncMessage::new, ModVariables.PlayerVariablesSyncMessage::handler); + addNetworkMessage(ModVariables.PlayerVariablesSyncMessage.class, ModVariables.PlayerVariablesSyncMessage::buffer, ModVariables.PlayerVariablesSyncMessage::new, ModVariables.PlayerVariablesSyncMessage::handler); event.enqueueWork(() -> BrewingRecipeRegistry.addRecipe(Ingredient.of(PotionUtils.setPotion(new ItemStack(Items.POTION), Potions.WATER)), Ingredient.of(Items.LIGHTNING_ROD), PotionUtils.setPotion(new ItemStack(Items.POTION), ModPotion.SHOCK.get()))); diff --git a/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java b/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java index 80543ec21..2d176a3de 100644 --- a/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java +++ b/src/main/java/net/mcreator/superbwarfare/network/ModVariables.java @@ -22,7 +22,6 @@ import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.network.NetworkEvent; import net.minecraftforge.network.PacketDistributor; @@ -31,11 +30,6 @@ import java.util.function.Supplier; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class ModVariables { - @SubscribeEvent - public static void init(FMLCommonSetupEvent event) { - ModUtils.addNetworkMessage(SavedDataSyncMessage.class, SavedDataSyncMessage::buffer, SavedDataSyncMessage::new, SavedDataSyncMessage::handler); - ModUtils.addNetworkMessage(PlayerVariablesSyncMessage.class, PlayerVariablesSyncMessage::buffer, PlayerVariablesSyncMessage::new, PlayerVariablesSyncMessage::handler); - } @SubscribeEvent public static void init(RegisterCapabilitiesEvent event) { @@ -126,7 +120,7 @@ public class ModVariables { } public static class WorldVariables extends SavedData { - public static final String DATA_NAME = "target_world_variables"; + public static final String DATA_NAME = ModUtils.MODID + "_world_variables"; public static WorldVariables load(CompoundTag tag) { WorldVariables data = new WorldVariables(); @@ -158,7 +152,7 @@ public class ModVariables { } public static class MapVariables extends SavedData { - public static final String DATA_NAME = "target_map_variables"; + public static final String DATA_NAME = ModUtils.MODID + "_map_variables"; public boolean pvpMode = false; public static MapVariables load(CompoundTag tag) { @@ -245,7 +239,7 @@ public class ModVariables { @SubscribeEvent public static void onAttachCapabilities(AttachCapabilitiesEvent event) { if (event.getObject() instanceof Player && !(event.getObject() instanceof FakePlayer)) - event.addCapability(new ResourceLocation("target", "player_variables"), new PlayerVariablesProvider()); + event.addCapability(new ResourceLocation(ModUtils.MODID, "player_variables"), new PlayerVariablesProvider()); } private final PlayerVariables playerVariables = new PlayerVariables(); @@ -347,11 +341,6 @@ public class ModVariables { } } - @SubscribeEvent - public static void registerMessage(FMLCommonSetupEvent event) { - ModUtils.addNetworkMessage(PlayerVariablesSyncMessage.class, PlayerVariablesSyncMessage::buffer, PlayerVariablesSyncMessage::new, PlayerVariablesSyncMessage::handler); - } - public static class PlayerVariablesSyncMessage { private final int target; private final PlayerVariables data;