diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 42e989ed7..5d877393f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -137,7 +137,7 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.version.AdaptorNotifier; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -165,7 +165,7 @@ import java.time.LocalDateTime; import java.time.Month; import java.util.Map; -public class ClientProxy extends CommonProxy { +public class ClientProxy implements IProxy { public static boolean jingleTheBells = false; public static boolean dootDoot = false; @@ -185,8 +185,6 @@ public class ClientProxy extends CommonProxy { Botania.LOGGER.fatal("Persistent Variables couldn't load!!"); } - super.preInit(event); - MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); initRenderers(); @@ -194,7 +192,6 @@ public class ClientProxy extends CommonProxy { @Override public void init(FMLInitializationEvent event) { - super.init(event); ColorHandler.init(); initAuxiliaryRender(); @@ -232,7 +229,6 @@ public class ClientProxy extends CommonProxy { @Override public void postInit(FMLPostInitializationEvent event) { - super.postInit(event); CorporeaAutoCompleteHandler.updateItemList(); } @@ -329,7 +325,6 @@ public class ClientProxy extends CommonProxy { @Override public void setExtraReach(EntityLivingBase entity, float reach) { - super.setExtraReach(entity, reach); Minecraft mc = Minecraft.getMinecraft(); EntityPlayer player = mc.thePlayer; if(entity == player) { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 1e542160e..43946269c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,6 +10,16 @@ */ package vazkii.botania.common; +import net.minecraft.entity.Entity; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.EntityDragonPart; +import net.minecraft.entity.boss.EntityWither; +import net.minecraft.entity.item.EntityEnderCrystal; +import net.minecraft.entity.item.EntityItemFrame; +import net.minecraft.entity.item.EntityPainting; +import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -23,12 +33,64 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.ITwoNamedPage; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.block.ModBanners; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModMultiblocks; +import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; +import vazkii.botania.common.block.tile.TileLightRelay; +import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.core.command.CommandOpen; +import vazkii.botania.common.core.command.CommandShare; +import vazkii.botania.common.core.command.CommandSkyblockSpread; +import vazkii.botania.common.core.handler.BiomeDecorationHandler; +import vazkii.botania.common.core.handler.CommonTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.IMCHandler; +import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.core.handler.ModSounds; +import vazkii.botania.common.core.handler.PixieHandler; +import vazkii.botania.common.core.handler.SheddingHandler; +import vazkii.botania.common.core.loot.LootHandler; +import vazkii.botania.common.core.proxy.IProxy; +import vazkii.botania.common.crafting.ModBrewRecipes; +import vazkii.botania.common.crafting.ModCraftingRecipes; +import vazkii.botania.common.crafting.ModElvenTradeRecipes; +import vazkii.botania.common.crafting.ModManaAlchemyRecipes; +import vazkii.botania.common.crafting.ModManaConjurationRecipes; +import vazkii.botania.common.crafting.ModManaInfusionRecipes; +import vazkii.botania.common.crafting.ModMigrationRecipes; +import vazkii.botania.common.crafting.ModPetalRecipes; +import vazkii.botania.common.crafting.ModPureDaisyRecipes; +import vazkii.botania.common.crafting.ModRuneRecipes; +import vazkii.botania.common.entity.EntityCorporeaSpark; +import vazkii.botania.common.entity.EntityDoppleganger; +import vazkii.botania.common.entity.EntityFlameRing; +import vazkii.botania.common.entity.EntityMagicLandmine; +import vazkii.botania.common.entity.EntityMagicMissile; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.entity.EntityPinkWither; +import vazkii.botania.common.entity.EntitySignalFlare; +import vazkii.botania.common.entity.EntitySpark; +import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.network.GuiHandler; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.world.SkyblockWorldEvents; +import vazkii.botania.common.world.WorldTypeSkyblock; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION, dependencies = LibMisc.DEPENDENCIES, guiFactory = LibMisc.GUI_FACTORY, acceptedMinecraftVersions = LibMisc.MC_VERSIONS, updateJSON = LibMisc.UPDATE_JSON) @@ -48,8 +110,8 @@ public class Botania { @Instance(LibMisc.MOD_ID) public static Botania instance; - @SidedProxy(serverSide = LibMisc.PROXY_COMMON, clientSide = LibMisc.PROXY_CLIENT) - public static CommonProxy proxy; + @SidedProxy(serverSide = LibMisc.PROXY_SERVER, clientSide = LibMisc.PROXY_CLIENT) + public static IProxy proxy; public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); @@ -67,27 +129,116 @@ public class Botania { storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); + BotaniaAPI.internalHandler = new InternalMethodHandler(); + + ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); + + PacketHandler.init(); + ModSounds.init(); + ModBlocks.init(); + ModItems.init(); + ModEntities.init(); + ModPotions.init(); + ModBrews.init(); + + ModAchievements.init(); + ModMultiblocks.init(); + ModBanners.init(); + + if(Botania.gardenOfGlassLoaded) + new WorldTypeSkyblock(); + proxy.preInit(event); } @EventHandler public void init(FMLInitializationEvent event) { + ModCraftingRecipes.init(); + ModMigrationRecipes.init(); + ModPetalRecipes.init(); + ModPureDaisyRecipes.init(); + ModRuneRecipes.init(); + ModManaAlchemyRecipes.init(); + ModManaConjurationRecipes.init(); + ModManaInfusionRecipes.init(); + ModElvenTradeRecipes.init(); + ModBrewRecipes.init(); + LexiconData.init(); + + NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); + + MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); + MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); + MinecraftForge.EVENT_BUS.register(PixieHandler.class); + MinecraftForge.EVENT_BUS.register(SheddingHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); + MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); + MinecraftForge.EVENT_BUS.register(new LootHandler()); + + if(Botania.gardenOfGlassLoaded) + MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); + + MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); + + FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); + + if(Botania.bcTriggersLoaded) + new StatementAPIPlugin(); proxy.init(event); } @EventHandler public void postInit(FMLPostInitializationEvent event) { + if(Botania.thaumcraftLoaded) { + ModBrews.initTC(); + ModBrewRecipes.initTC(); + try { + @SuppressWarnings("unchecked") + Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); + BotaniaAPI.blacklistEntityFromGravityRod(clazz); + } catch (ClassNotFoundException ignored) {} + } + + ModBlocks.addDispenserBehaviours(); + ModBlocks.registerMultiparts(); + ConfigHandler.loadPostInit(); + LexiconData.postInit(); + + int words = 0; + for(LexiconEntry entry : BotaniaAPI.getAllEntries()) + for(LexiconPage page : entry.pages) { + words += countWords(page.getUnlocalizedName()); + if(page instanceof ITwoNamedPage) + words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName()); + } + Botania.LOGGER.info("The Lexica Botania has {} words.", words); + + registerDefaultEntityBlacklist(); proxy.postInit(event); } + // Overriding the internal method handler will break everything as it changes regularly. + // So just don't be a moron and don't override it. Thanks. @EventHandler public void serverStarting(FMLServerAboutToStartEvent event) { - proxy.serverAboutToStart(event); + String clname = BotaniaAPI.internalHandler.getClass().getName(); + String expect = "vazkii.botania.common.core.handler.InternalMethodHandler"; + if(!clname.equals(expect)) { + new IllegalAccessError("The Botania API internal method handler has been overriden. " + + "This will cause crashes and compatibility issues, and that's why it's marked as" + + " \"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 + ")").printStackTrace(); + FMLCommonHandler.instance().exitJava(1, true); + } } @EventHandler public void serverStarting(FMLServerStartingEvent event) { - proxy.serverStarting(event); + // todo 1.8 - we don't have a file server yet. event.registerServerCommand(new CommandDownloadLatest()); + event.registerServerCommand(new CommandShare()); + event.registerServerCommand(new CommandOpen()); + if(Botania.gardenOfGlassLoaded) + event.registerServerCommand(new CommandSkyblockSpread()); } @EventHandler @@ -100,4 +251,31 @@ public class Botania { IMCHandler.processMessages(event.getMessages()); } + private int countWords(String s) { + String s1 = I18n.translateToLocal(s); + return s1.split("\\s+").length; + } + + private void registerDefaultEntityBlacklist() { + // Vanilla + BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class); + + // Botania + BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class); + BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class); + BotaniaAPI.blacklistEntityFromGravityRod(TileLightRelay.EntityPlayerMover.class); + } + } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java deleted file mode 100644 index f69406110..000000000 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ /dev/null @@ -1,321 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)] - */ -package vazkii.botania.common.core.proxy; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.boss.EntityDragon; -import net.minecraft.entity.boss.EntityDragonPart; -import net.minecraft.entity.boss.EntityWither; -import net.minecraft.entity.item.EntityEnderCrystal; -import net.minecraft.entity.item.EntityItemFrame; -import net.minecraft.entity.item.EntityPainting; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemRecord; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.boss.IBotaniaBoss; -import vazkii.botania.api.lexicon.ITwoNamedPage; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.common.Botania; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.block.ModBanners; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModMultiblocks; -import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.command.CommandOpen; -import vazkii.botania.common.core.command.CommandShare; -import vazkii.botania.common.core.command.CommandSkyblockSpread; -import vazkii.botania.common.core.handler.BiomeDecorationHandler; -import vazkii.botania.common.core.handler.CommonTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.handler.InternalMethodHandler; -import vazkii.botania.common.core.loot.LootHandler; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.handler.PixieHandler; -import vazkii.botania.common.core.handler.SheddingHandler; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.crafting.ModBrewRecipes; -import vazkii.botania.common.crafting.ModCraftingRecipes; -import vazkii.botania.common.crafting.ModElvenTradeRecipes; -import vazkii.botania.common.crafting.ModManaAlchemyRecipes; -import vazkii.botania.common.crafting.ModManaConjurationRecipes; -import vazkii.botania.common.crafting.ModManaInfusionRecipes; -import vazkii.botania.common.crafting.ModMigrationRecipes; -import vazkii.botania.common.crafting.ModPetalRecipes; -import vazkii.botania.common.crafting.ModPureDaisyRecipes; -import vazkii.botania.common.crafting.ModRuneRecipes; -import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.entity.EntityFlameRing; -import vazkii.botania.common.entity.EntityMagicLandmine; -import vazkii.botania.common.entity.EntityMagicMissile; -import vazkii.botania.common.entity.EntityManaBurst; -import vazkii.botania.common.entity.EntityPinkWither; -import vazkii.botania.common.entity.EntitySignalFlare; -import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.network.GuiHandler; -import vazkii.botania.common.network.PacketHandler; -import vazkii.botania.common.world.SkyblockWorldEvents; -import vazkii.botania.common.world.WorldTypeSkyblock; - -public class CommonProxy { - - public void preInit(FMLPreInitializationEvent event) { - BotaniaAPI.internalHandler = new InternalMethodHandler(); - - ConfigHandler.loadConfig(event.getSuggestedConfigurationFile()); - - PacketHandler.init(); - ModSounds.init(); - ModBlocks.init(); - ModItems.init(); - ModEntities.init(); - ModPotions.init(); - ModBrews.init(); - - ModAchievements.init(); - ModMultiblocks.init(); - ModBanners.init(); - - if(Botania.gardenOfGlassLoaded) - new WorldTypeSkyblock(); - } - - public void init(FMLInitializationEvent event) { - ModCraftingRecipes.init(); - ModMigrationRecipes.init(); - ModPetalRecipes.init(); - ModPureDaisyRecipes.init(); - ModRuneRecipes.init(); - ModManaAlchemyRecipes.init(); - ModManaConjurationRecipes.init(); - ModManaInfusionRecipes.init(); - ModElvenTradeRecipes.init(); - ModBrewRecipes.init(); - LexiconData.init(); - - NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); - - MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); - MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(PixieHandler.class); - MinecraftForge.EVENT_BUS.register(SheddingHandler.class); - MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); - MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); - MinecraftForge.EVENT_BUS.register(new LootHandler()); - - if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); - - MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); - - FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - - if(Botania.bcTriggersLoaded) - new StatementAPIPlugin(); - } - - public void postInit(FMLPostInitializationEvent event) { - if(Botania.thaumcraftLoaded) { - ModBrews.initTC(); - ModBrewRecipes.initTC(); - try { - @SuppressWarnings("unchecked") - Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); - BotaniaAPI.blacklistEntityFromGravityRod(clazz); - } catch (ClassNotFoundException ignored) {} - } - - ModBlocks.addDispenserBehaviours(); - ModBlocks.registerMultiparts(); - ConfigHandler.loadPostInit(); - LexiconData.postInit(); - - int words = 0; - for(LexiconEntry entry : BotaniaAPI.getAllEntries()) - for(LexiconPage page : entry.pages) { - words += countWords(page.getUnlocalizedName()); - if(page instanceof ITwoNamedPage) - words += countWords(((ITwoNamedPage) page).getSecondUnlocalizedName()); - } - Botania.LOGGER.info("The Lexica Botania has {} words.", words); - - registerDefaultEntityBlacklist(); - } - - private int countWords(String s) { - String s1 = I18n.translateToLocal(s); - return s1.split("\\s+").length; - } - - private void registerDefaultEntityBlacklist() { - // Vanilla - BotaniaAPI.blacklistEntityFromGravityRod(EntityDragon.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityDragonPart.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityWither.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityItemFrame.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityEnderCrystal.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPainting.class); - - // Botania - BotaniaAPI.blacklistEntityFromGravityRod(EntityCorporeaSpark.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityDoppleganger.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityFlameRing.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicLandmine.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityMagicMissile.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityManaBurst.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPinkWither.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntitySignalFlare.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntitySpark.class); - BotaniaAPI.blacklistEntityFromGravityRod(EntityPlayerMover.class); - } - - // Overriding the internal method handler will break everything as it changes regularly. - // So just don't be a moron and don't override it. Thanks. - public void serverAboutToStart(FMLServerAboutToStartEvent event) { - String clname = BotaniaAPI.internalHandler.getClass().getName(); - String expect = "vazkii.botania.common.core.handler.InternalMethodHandler"; - if(!clname.equals(expect)) { - new IllegalAccessError("The Botania API internal method handler has been overriden. " - + "This will cause crashes and compatibility issues, and that's why it's marked as" - + " \"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 + ")").printStackTrace(); - FMLCommonHandler.instance().exitJava(1, true); - } - } - - public void serverStarting(FMLServerStartingEvent event) { - // todo 1.8 - we don't have a file server yet. event.registerServerCommand(new CommandDownloadLatest()); - event.registerServerCommand(new CommandShare()); - event.registerServerCommand(new CommandOpen()); - if(Botania.gardenOfGlassLoaded) - event.registerServerCommand(new CommandSkyblockSpread()); - } - - public void setEntryToOpen(LexiconEntry entry) {} - - public void setToTutorialIfFirstLaunch() {} - - public void setLexiconStack(ItemStack stack) {} - - public boolean isTheClientPlayer(EntityLivingBase entity) { - return false; - } - - public EntityPlayer getClientPlayer() { - return null; - } - - public boolean isClientPlayerWearingMonocle() { - return false; - } - - public String getLastVersion() { - return LibMisc.BUILD; - } - - public void setExtraReach(EntityLivingBase entity, float reach) { - if(entity instanceof EntityPlayerMP) - ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); - } - - public boolean openWikiPage(World world, Block block, RayTraceResult pos) { - return false; - } - - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} - - public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} - - public void removeSextantMultiblock() {} - - public long getWorldElapsedTicks() { - return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); - } - - public void setSparkleFXNoClip(boolean noclip) {} - - public void setSparkleFXCorrupt(boolean corrupt) {} - - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - sparkleFX(world, x, y, z, r, g, b, size, m, false); - } - - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} - - public void setWispFXDistanceLimit(boolean limit) {} - - public void setWispFXDepthTest(boolean depth) {} - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { - wispFX(world, x, y, z, r, g, b, size, 0F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity) { - wispFX(world, x, y, z, r, g, b, size, gravity, 1F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { - wispFX(world, x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { - wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); - } - - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} - - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { - lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); - } - - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} - - public void addBoss(IBotaniaBoss boss) {} - - public void removeBoss(IBotaniaBoss boss) {} - - public int getClientRenderDistance() { - return 0; - } - - public Object getEmptyModelBiped() { - return null; - } - -} diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java new file mode 100644 index 000000000..b67738de8 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -0,0 +1,96 @@ +package vazkii.botania.common.core.proxy; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemRecord; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.api.boss.IBotaniaBoss; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.core.helper.Vector3; + +public interface IProxy { + void preInit(FMLPreInitializationEvent event); + + void init(FMLInitializationEvent event); + + void postInit(FMLPostInitializationEvent event); + + void setEntryToOpen(LexiconEntry entry); + + void setToTutorialIfFirstLaunch(); + + void setLexiconStack(ItemStack stack); + + boolean isTheClientPlayer(EntityLivingBase entity); + + EntityPlayer getClientPlayer(); + + boolean isClientPlayerWearingMonocle(); + + String getLastVersion(); + + void setExtraReach(EntityLivingBase entity, float reach); + + boolean openWikiPage(World world, Block block, RayTraceResult pos); + + void playRecordClientSided(World world, BlockPos pos, ItemRecord record); + + void setMultiblock(World world, int x, int y, int z, double radius, Block block); + + void removeSextantMultiblock(); + + long getWorldElapsedTicks(); + + void setSparkleFXNoClip(boolean noclip); + + void setSparkleFXCorrupt(boolean corrupt); + + default void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { + sparkleFX(world, x, y, z, r, g, b, size, m, false); + } + + void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake); + + void setWispFXDistanceLimit(boolean limit); + + void setWispFXDepthTest(boolean depth); + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { + wispFX(world, x, y, z, r, g, b, size, 0F); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity) { + wispFX(world, x, y, z, r, g, b, size, gravity, 1F); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float gravity, float maxAgeMul) { + wispFX(world, x, y, z, r, g, b, size, 0, -gravity, 0, maxAgeMul); + } + + default void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { + wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); + } + + void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul); + + default void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { + lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); + } + + void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner); + + void addBoss(IBotaniaBoss boss); + + void removeBoss(IBotaniaBoss boss); + + int getClientRenderDistance(); + + Object getEmptyModelBiped(); +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java new file mode 100644 index 000000000..ca46b008e --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -0,0 +1,133 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jan 13, 2014, 7:45:37 PM (GMT)] + */ +package vazkii.botania.common.core.proxy; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemRecord; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.api.boss.IBotaniaBoss; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibMisc; + +public class ServerProxy implements IProxy { + + @Override + public void preInit(FMLPreInitializationEvent event) {} + + @Override + public void init(FMLInitializationEvent event) {} + + @Override + public void postInit(FMLPostInitializationEvent event) {} + + @Override + public void setEntryToOpen(LexiconEntry entry) {} + + @Override + public void setToTutorialIfFirstLaunch() {} + + @Override + public void setLexiconStack(ItemStack stack) {} + + @Override + public boolean isTheClientPlayer(EntityLivingBase entity) { + return false; + } + + @Override + public EntityPlayer getClientPlayer() { + return null; + } + + @Override + public boolean isClientPlayerWearingMonocle() { + return false; + } + + @Override + public String getLastVersion() { + return LibMisc.BUILD; + } + + @Override + public void setExtraReach(EntityLivingBase entity, float reach) { + if(entity instanceof EntityPlayerMP) + ((EntityPlayerMP) entity).interactionManager.setBlockReachDistance(Math.max(5, ((EntityPlayerMP) entity).interactionManager.getBlockReachDistance() + reach)); + } + + @Override + public boolean openWikiPage(World world, Block block, RayTraceResult pos) { + return false; + } + + @Override + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} + + @Override + public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} + + @Override + public void removeSextantMultiblock() {} + + @Override + public long getWorldElapsedTicks() { + return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); + } + + @Override + public void setSparkleFXNoClip(boolean noclip) {} + + @Override + public void setSparkleFXCorrupt(boolean corrupt) {} + + @Override + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} + + @Override + public void setWispFXDistanceLimit(boolean limit) {} + + @Override + public void setWispFXDepthTest(boolean depth) {} + + @Override + public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} + + @Override + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} + + @Override + public void addBoss(IBotaniaBoss boss) {} + + @Override + public void removeBoss(IBotaniaBoss boss) {} + + @Override + public int getClientRenderDistance() { + return 0; + } + + @Override + public Object getEmptyModelBiped() { + return null; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 3bfdd51ee..b943a2ce0 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -25,7 +25,7 @@ public final class LibMisc { public static final String NETWORK_CHANNEL = MOD_ID; // Proxy Constants - public static final String PROXY_COMMON = "vazkii.botania.common.core.proxy.CommonProxy"; + public static final String PROXY_SERVER = "vazkii.botania.common.core.proxy.ServerProxy"; public static final String PROXY_CLIENT = "vazkii.botania.client.core.proxy.ClientProxy"; public static final String GUI_FACTORY = "vazkii.botania.client.core.proxy.GuiFactory";