Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated Aether menu footer

Browse source
This commit is contained in:
Kino 2017-03-21 22:37:12 -04:00
parent 63021b154b
commit 902b4feb4c
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/legacy/aether/client/AetherClientEvents.java
View file

@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent;
import com.legacy.aether.client.gui.AetherLoadingScreen; import com.legacy.aether.client.gui.AetherLoadingScreen;
import com.legacy.aether.client.gui.inventory.GuiAccessories; import com.legacy.aether.client.gui.inventory.GuiAccessories;
import com.legacy.aether.server.AetherConfig;
import com.legacy.aether.server.containers.inventory.InventoryAccessories; import com.legacy.aether.server.containers.inventory.InventoryAccessories;
import com.legacy.aether.server.items.ItemsAether; import com.legacy.aether.server.items.ItemsAether;
import com.legacy.aether.server.networking.AetherGuiHandler; import com.legacy.aether.server.networking.AetherGuiHandler;
@ -38,9 +39,12 @@ public class AetherClientEvents
{ {
if (type.equals(TickEvent.Type.CLIENT)) if (type.equals(TickEvent.Type.CLIENT))
{ {
if (!(mc.loadingScreen instanceof AetherLoadingScreen)) if (!AetherConfig.triviaDisabled())
{ {
mc.loadingScreen = new AetherLoadingScreen(mc); if (!(mc.loadingScreen instanceof AetherLoadingScreen))
{
mc.loadingScreen = new AetherLoadingScreen(mc);
}
} }
} }
} }

9
src/main/java/com/legacy/aether/server/AetherConfig.java
View file

@ -12,6 +12,8 @@ public class AetherConfig
private static int aether_biome_id, aether_dimension_id; private static int aether_biome_id, aether_dimension_id;
private static boolean disable_trivia;
private static boolean skyrootBucketOnly; private static boolean skyrootBucketOnly;
public static void init(File location) public static void init(File location)
@ -39,6 +41,8 @@ public class AetherConfig
skyrootBucketOnly = config.get("Misc", "Activate portal with only Skyroot bucket", false).getBoolean(false); skyrootBucketOnly = config.get("Misc", "Activate portal with only Skyroot bucket", false).getBoolean(false);
disable_trivia = config.get("Trivia", "Disable random trivia", false).getBoolean(false);
config.save(); config.save();
} }
@ -52,6 +56,11 @@ public class AetherConfig
return AetherConfig.aether_biome_id; return AetherConfig.aether_biome_id;
} }
public static boolean triviaDisabled()
{
return AetherConfig.disable_trivia;
}
public static boolean shouldUseAetherMenu() public static boolean shouldUseAetherMenu()
{ {
return AetherConfig.aether_menu; return AetherConfig.aether_menu;