diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index b395c57e4..23d321854 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -11,10 +11,7 @@ package vazkii.botania.common; import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; @@ -64,7 +61,7 @@ import vazkii.botania.common.core.loot.TrueGuardianKiller; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.proxy.ServerProxy; import vazkii.botania.common.crafting.FluxfieldCondition; -import vazkii.botania.common.crafting.ReloadListener; +import vazkii.botania.common.crafting.SyncHandler; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import vazkii.botania.common.network.PacketHandler; @@ -74,7 +71,6 @@ import vazkii.botania.common.world.WorldTypeSkyblock; import vazkii.patchouli.api.IMultiblock; import vazkii.patchouli.api.IStateMatcher; import vazkii.patchouli.api.PatchouliAPI; -import vazkii.patchouli.common.multiblock.Multiblock; import vazkii.patchouli.common.multiblock.StateMatcher; @Mod(LibMisc.MOD_ID) @@ -332,7 +328,7 @@ public class Botania { + " \"Do not Override\". Whoever had the brilliant idea of overriding it needs to go" + " back to elementary school and learn to read. (Expected classname: " + expect + ", Actual classname: " + clname + ")"); } - event.getServer().getResourceManager().addReloadListener(new ReloadListener()); + event.getServer().getResourceManager().addReloadListener(new SyncHandler.ReloadListener()); } private void serverStarting(FMLServerStartingEvent event) { diff --git a/src/main/java/vazkii/botania/common/crafting/ReloadListener.java b/src/main/java/vazkii/botania/common/crafting/ReloadListener.java deleted file mode 100644 index a6853a930..000000000 --- a/src/main/java/vazkii/botania/common/crafting/ReloadListener.java +++ /dev/null @@ -1,54 +0,0 @@ -package vazkii.botania.common.crafting; - -import com.google.common.collect.ImmutableMap; -import net.minecraft.resources.IResourceManager; -import net.minecraft.resources.IResourceManagerReloadListener; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.network.PacketDistributor; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeElvenTrade; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.recipe.RecipePureDaisy; -import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.recipe.RegisterRecipesEvent; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.network.PacketHandler; -import vazkii.botania.common.network.PacketSyncRecipes; - -import javax.annotation.Nullable; -import java.util.HashMap; -import java.util.Map; - -public class ReloadListener implements IResourceManagerReloadListener { - @Override - public void onResourceManagerReload(@Nullable IResourceManager manager) { - Map pureDaisy = new HashMap<>(); - Map manaInfusion = new HashMap<>(); - Map brew = new HashMap<>(); - Map elvenTrade = new HashMap<>(); - Map apothecary = new HashMap<>(); - Map runeAltar = new HashMap<>(); - - RegisterRecipesEvent evt = new RegisterRecipesEvent( - r -> pureDaisy.put(r.getId(), r), - r -> manaInfusion.put(r.getId(), r), - r -> brew.put(r.getId(), r), - r -> elvenTrade.put(r.getId(), r), - r -> apothecary.put(r.getId(), r), - r -> runeAltar.put(r.getId(), r) - ); - MinecraftForge.EVENT_BUS.post(evt); - - BotaniaAPI.pureDaisyRecipes = ImmutableMap.copyOf(pureDaisy); - BotaniaAPI.manaInfusionRecipes = ImmutableMap.copyOf(manaInfusion); - BotaniaAPI.brewRecipes = ImmutableMap.copyOf(brew); - BotaniaAPI.elvenTradeRecipes = ImmutableMap.copyOf(elvenTrade); - BotaniaAPI.petalRecipes = ImmutableMap.copyOf(apothecary); - BotaniaAPI.runeAltarRecipes = ImmutableMap.copyOf(runeAltar); - PacketHandler.HANDLER.send(PacketDistributor.ALL.noArg(), new PacketSyncRecipes(brew, elvenTrade, manaInfusion, - apothecary, pureDaisy, runeAltar)); - } -} diff --git a/src/main/java/vazkii/botania/common/crafting/SyncHandler.java b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java new file mode 100644 index 000000000..6cc848f85 --- /dev/null +++ b/src/main/java/vazkii/botania/common/crafting/SyncHandler.java @@ -0,0 +1,90 @@ +package vazkii.botania.common.crafting; + +import com.google.common.collect.ImmutableMap; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.resources.IResourceManager; +import net.minecraft.resources.IResourceManagerReloadListener; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ClientPlayerNetworkEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.network.PacketDistributor; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.api.recipe.RecipeElvenTrade; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.api.recipe.RecipePetals; +import vazkii.botania.api.recipe.RecipePureDaisy; +import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.recipe.RegisterRecipesEvent; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.network.PacketSyncRecipes; + +import javax.annotation.Nullable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +public class SyncHandler { + public static class ReloadListener implements IResourceManagerReloadListener { + @Override + public void onResourceManagerReload(@Nullable IResourceManager manager) { + Map pureDaisy = new HashMap<>(); + Map manaInfusion = new HashMap<>(); + Map brew = new HashMap<>(); + Map elvenTrade = new HashMap<>(); + Map apothecary = new HashMap<>(); + Map runeAltar = new HashMap<>(); + + RegisterRecipesEvent evt = new RegisterRecipesEvent( + r -> pureDaisy.put(r.getId(), r), + r -> manaInfusion.put(r.getId(), r), + r -> brew.put(r.getId(), r), + r -> elvenTrade.put(r.getId(), r), + r -> apothecary.put(r.getId(), r), + r -> runeAltar.put(r.getId(), r) + ); + MinecraftForge.EVENT_BUS.post(evt); + + BotaniaAPI.pureDaisyRecipes = ImmutableMap.copyOf(pureDaisy); + BotaniaAPI.manaInfusionRecipes = ImmutableMap.copyOf(manaInfusion); + BotaniaAPI.brewRecipes = ImmutableMap.copyOf(brew); + BotaniaAPI.elvenTradeRecipes = ImmutableMap.copyOf(elvenTrade); + BotaniaAPI.petalRecipes = ImmutableMap.copyOf(apothecary); + BotaniaAPI.runeAltarRecipes = ImmutableMap.copyOf(runeAltar); + PacketHandler.HANDLER.send(PacketDistributor.ALL.noArg(), syncPacket()); + } + } + + private static PacketSyncRecipes syncPacket() { + return new PacketSyncRecipes(BotaniaAPI.brewRecipes, BotaniaAPI.elvenTradeRecipes, BotaniaAPI.manaInfusionRecipes, + BotaniaAPI.petalRecipes, BotaniaAPI.pureDaisyRecipes, BotaniaAPI.runeAltarRecipes); + } + + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) + public static class ClientEvents { + @SubscribeEvent + public static void clientLogout(ClientPlayerNetworkEvent.LoggedOutEvent evt) { + BotaniaAPI.brewRecipes = Collections.emptyMap(); + BotaniaAPI.elvenTradeRecipes = Collections.emptyMap(); + BotaniaAPI.manaInfusionRecipes = Collections.emptyMap(); + BotaniaAPI.petalRecipes = Collections.emptyMap(); + BotaniaAPI.pureDaisyRecipes = Collections.emptyMap(); + BotaniaAPI.runeAltarRecipes = Collections.emptyMap(); + } + } + + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) + public static class CommonEvents { + @SubscribeEvent + public static void serverLogin(PlayerEvent.PlayerLoggedInEvent evt) { + PacketHandler.sendNonLocal((ServerPlayerEntity) evt.getPlayer(), syncPacket()); + } + } + +} diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index a185a6104..9b44799ed 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -58,6 +58,12 @@ public final class PacketHandler { HANDLER.sendTo(toSend, playerMP.connection.getNetworkManager(), NetworkDirection.PLAY_TO_CLIENT); } + public static void sendNonLocal(ServerPlayerEntity playerMP, Object toSend) { + if(playerMP.server.isDedicatedServer() || !playerMP.getGameProfile().getName().equals(playerMP.server.getServerOwner())) { + sendTo(playerMP, toSend); + } + } + public static void sendToServer(Object msg) { HANDLER.sendToServer(msg); }