Merge branch 'master' into CosmicNeutroniumBlockSolidifierRecipe

dependencies.gradle

@@ -1,10 +1,12 @@
 // Add your dependencies here
 
 dependencies {
- api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.41:dev")
+ api("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.44:dev")
  api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
  api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
+ implementation("com.github.GTNewHorizons:GTNHLib:0.5.15:dev")
+
  compileOnly("com.github.GTNewHorizons:AkashicTome:1.1.7:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:Avaritia:1.54:dev") { transitive = false }
  compileOnly("com.github.GTNewHorizons:twilightforest:2.6.34:dev") { transitive = false }

src/main/java/com/dreammaster/client/util/GTNHPauseScreen.java

@@ -0,0 +1,88 @@
+package com.dreammaster.client.util;
+
+import java.net.URI;
+
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiIngameMenu;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import net.minecraftforge.client.event.GuiScreenEvent;
+
+import org.lwjgl.opengl.GL11;
+
+import com.dreammaster.main.MainRegistry;
+import com.gtnewhorizon.gtnhlib.util.FilesUtil;
+
+import cpw.mods.fml.common.eventhandler.EventPriority;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
+public class GTNHPauseScreen {
+
+ private static final ResourceLocation GTNH_LOGO = new ResourceLocation(
+ "dreamcraft",
+ "textures/icon/GTNH_256x256.png");
+ private static final int BUG_BUTTON_ID = -161518;
+ private static final int WIKI_BUTTON_ID = -8998561;
+
+ @SuppressWarnings("unchecked")
+ @SubscribeEvent
+ public void onInitGui(GuiScreenEvent.InitGuiEvent.Post event) {
+ if (!(event.gui instanceof GuiIngameMenu)) return;
+ final int buttonWidth = 80;
+ event.buttonList.add(
+ new GuiButton(
+ BUG_BUTTON_ID,
+ event.gui.width / 2 - 100 - 10 - buttonWidth,
+ event.gui.height / 4 + 24 - 16,
+ buttonWidth,
+ 20,
+ StatCollector.translateToLocal("dreamcraft.pausemenu.bug")));
+ event.buttonList.add(
+ new GuiButton(
+ WIKI_BUTTON_ID,
+ event.gui.width / 2 - 100 - 10 - buttonWidth,
+ event.gui.height / 4 + 24 - 16 + 24,
+ buttonWidth,
+ 20,
+ StatCollector.translateToLocal("dreamcraft.pausemenu.wiki")));
+ // TODO add credits page
+ }
+
+ @SubscribeEvent(priority = EventPriority.HIGHEST)
+ public void onDrawScreen(GuiScreenEvent.DrawScreenEvent.Post event) {
+ if (!(event.gui instanceof GuiIngameMenu)) return;
+ GL11.glPushMatrix();
+ GL11.glEnable(GL11.GL_ALPHA_TEST);
+ GL11.glEnable(GL11.GL_BLEND);
+ OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+ GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+ event.gui.mc.getTextureManager().bindTexture(GTNH_LOGO);
+ GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+ final int drawX = event.gui.width / 2 - 100 - 10 - 80 + (80 - 64) / 2;
+ final int drawY = event.gui.height / 4 + 24 - 16 - 64;
+ Gui.func_146110_a(drawX, drawY, 0f, 0f, 64, 64, 64f, 64f);
+ GL11.glPopMatrix();
+ }
+
+ @SubscribeEvent
+ public void onActionPerformed(GuiScreenEvent.ActionPerformedEvent.Post event) {
+ if (!(event.gui instanceof GuiIngameMenu)) return;
+ if (event.button.id == BUG_BUTTON_ID) {
+ gtnh$openUrl("https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues");
+ } else if (event.button.id == WIKI_BUTTON_ID) {
+ gtnh$openUrl("https://wiki.gtnewhorizons.com/wiki/Main_Page");
+ }
+ }
+
+ private static void gtnh$openUrl(String address) {
+ try {
+ final URI uri = new URI(address);
+ FilesUtil.openUri(uri);
+ } catch (Throwable throwable) {
+ MainRegistry.Logger.error("Couldn't open link", throwable);
+ }
+ }
+
+}

src/main/java/com/dreammaster/command/AllPurposeDebugCommand.java

@@ -1,6 +1,5 @@
 package com.dreammaster.command;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
@@ -26,12 +25,6 @@
 // command is only available while running in debug mode
 public class AllPurposeDebugCommand implements ICommand {
 
- private List aliases;
-
- public AllPurposeDebugCommand() {
- aliases = new ArrayList();
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -49,8 +42,7 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
- return aliases;
+ return null;
  }
 
  private void moarArgs(ICommandSender pCmdSender) {

src/main/java/com/dreammaster/command/CustomDropsCommand.java

@@ -15,14 +15,6 @@
 
 public class CustomDropsCommand implements ICommand {
 
- private List aliases;
-
- public CustomDropsCommand() {
- aliases = new ArrayList();
- aliases.add("cdrops");
- aliases.add("cdr");
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -40,7 +32,9 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
+ List<String> aliases = new ArrayList<>();
+ aliases.add("cdrops");
+ aliases.add("cdr");
  return aliases;
  }
 

src/main/java/com/dreammaster/command/CustomFuelsCommand.java

@@ -15,14 +15,6 @@
 
 public class CustomFuelsCommand implements ICommand {
 
- private List aliases;
-
- public CustomFuelsCommand() {
- aliases = new ArrayList();
- aliases.add("cfuels");
- aliases.add("cfl");
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -40,7 +32,9 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
+ ArrayList<String> aliases = new ArrayList<>();
+ aliases.add("cfuels");
+ aliases.add("cfl");
  return aliases;
  }
 

src/main/java/com/dreammaster/command/CustomToolTipsCommand.java

@@ -15,14 +15,6 @@
 
 public class CustomToolTipsCommand implements ICommand {
 
- private List aliases;
-
- public CustomToolTipsCommand() {
- aliases = new ArrayList();
- aliases.add("ctooltip");
- aliases.add("ctt");
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -40,7 +32,9 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
+ ArrayList<String> aliases = new ArrayList<>();
+ aliases.add("ctooltip");
+ aliases.add("ctt");
  return aliases;
  }
 

src/main/java/com/dreammaster/command/HazardousItemsCommand.java

@@ -16,14 +16,6 @@
 
 public class HazardousItemsCommand implements ICommand {
 
- private List aliases;
-
- public HazardousItemsCommand() {
- aliases = new ArrayList();
- aliases.add("hazarditems");
- aliases.add("hazit");
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -41,7 +33,9 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
+ ArrayList<String> aliases = new ArrayList<>();
+ aliases.add("hazarditems");
+ aliases.add("hazit");
  return aliases;
  }
 

src/main/java/com/dreammaster/command/ItemInHandInfoCommand.java

@@ -1,6 +1,6 @@
 package com.dreammaster.command;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import net.minecraft.command.ICommand;
@@ -15,13 +15,6 @@
 
 public class ItemInHandInfoCommand implements ICommand {
 
- private List aliases;
-
- public ItemInHandInfoCommand() {
- aliases = new ArrayList();
- aliases.add("iih");
- }
-
  @Override
  public int compareTo(Object arg0) {
  return 0;
@@ -39,8 +32,7 @@ public String getCommandUsage(ICommandSender p_71518_1_) {
 
  @Override
  public List getCommandAliases() {
-
- return aliases;
+ return Collections.singletonList("iih");
  }
 
  @Override

src/main/java/com/dreammaster/config/CoreModConfig.java

@@ -15,6 +15,7 @@ public CoreModConfig(File pConfigBaseDirectory, String pModCollectionDirectory,
 
  public boolean OreDictItems_Enabled;
  public static boolean ModLoginMessage_Enabled;
+ public boolean gtnhPauseMenuButtons;
  public static String ModPackVersion = Refstrings.MODPACKPACK_VERSION;
 
  public boolean ModHazardousItems_Enabled;
@@ -57,6 +58,7 @@ public CoreModConfig(File pConfigBaseDirectory, String pModCollectionDirectory,
  @Override
  protected void PreInit() {
  ModLoginMessage_Enabled = true;
+ gtnhPauseMenuButtons = true;
  ModDebugVersionDisplay_Enabled = true;
  ModHazardousItems_Enabled = false;
  ModCustomToolTips_Enabled = false;
@@ -99,6 +101,11 @@ protected void Init() {
  "Modules",
  ModLoginMessage_Enabled,
  "Set to true to show login message with modpack version");
+ gtnhPauseMenuButtons = _mainConfig.getBoolean(
+ "GTNH Pause menu buttons",
+ "Modules",
+ gtnhPauseMenuButtons,
+ "Set to true to display GTNH buttons in the pause menu");
  ModPackVersion = _mainConfig.getString("ModPackVersion", "Modules", ModPackVersion, "Version of the Modpack");
  ModDebugVersionDisplay_Enabled = _mainConfig.getBoolean(
  "DebugVersionDisplay",