Add offline mode config option and localize all config options (#2780)

This commit is contained in:
Hubry authored and Vasco Lavos committed 2018-11-30 04:35:05 +00:00
1 parent 6fb62b8d85
commit d0575240e6
4 files changed
+25 -5

No files matched your search

@@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiIngame;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
@@ -35,7 +34,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
@@ -71,7 +69,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.lib.LibMisc;
import vazkii.botania.common.lib.LibObfuscation;
import java.awt.Color;
import java.util.List;
@@ -401,7 +398,7 @@ public final class HUDHandler {
}
}
if(!draw && pos.entityHit == null) {
if(!ConfigHandler.lexicaOfflineMode && !draw && pos.entityHit == null) {
profiler.startSection("wikiLookup");
if(!block.isAir(state, mc.world, pos.getBlockPos()) && !(block instanceof BlockLiquid)) {
IWikiProvider provider = WikiHooks.getWikiFor(block);
@@ -282,6 +282,8 @@ public class ClientProxy implements IProxy {
@Override
public boolean openWikiPage(World world, Block block, RayTraceResult pos) {
if(ConfigHandler.lexicaOfflineMode)
return false;
IWikiProvider wiki = WikiHooks.getWikiFor(block);
String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().player);
if(url != null && !url.isEmpty()) {
@@ -15,7 +15,6 @@ import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
@@ -55,6 +54,7 @@ public final class ConfigHandler {
public static boolean renderBaubles = true;
public static boolean enableSeasonalFeatures = true;
public static boolean useShiftForQuickLookup = false;
public static boolean lexicaOfflineMode = false;
public static boolean enableArmorModels = true;
public static boolean enableFancySkybox = true;
public static boolean enableFancySkyboxInNormalWorlds = false;
@@ -161,6 +161,9 @@ public final class ConfigHandler {
desc = "Set this to true to use Shift instead of Ctrl for the inventory lexica botania quick lookup feature.";
useShiftForQuickLookup = loadPropBool("quickLookup.useShift", desc, useShiftForQuickLookup);
desc = "Set this to true to disable the wiki lookup feature of the lexica, for offline usage.";
lexicaOfflineMode = loadPropBool("quickLookup.lexicaOfflineMode", desc, lexicaOfflineMode);
desc = "Set this to false to disable custom armor models.";
enableArmorModels = loadPropBool("armorModels.enable", desc, enableArmorModels);