Merge remote-tracking branch 'origin/fixes' into dev

src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java

@@ -20,40 +20,40 @@ public interface UBOreTexturizer {
  // Overlay name is the fully qualified name, e.g. modname:overlayName
  // that static vars are fully qualified names for all the textures in the UB pack, just pass as is
  // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick"
- public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event);
+ void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event);
 
- public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event);
+ void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event);
 
- public void setupUBOre(
+ void setupUBOre(
  Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event);
 
- public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet;
+ void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet;
 
- public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet;
+ void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet;
 
- public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName)
+ void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName)
  throws BlocksAreAlreadySet;
 
- public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld);
+ void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld);
 
- public static String amber_overlay = "undergroundbiomes:amber_overlay";
- public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay";
- public static String coal_overlay = "undergroundbiomes:coal_overlay";
- public static String copper_overlay = "undergroundbiomes:copper_overlay";
- public static String diamond_overlay = "undergroundbiomes:diamond_overlay";
- public static String emerald_overlay = "undergroundbiomes:emerald_overlay";
- public static String gold_overlay = "undergroundbiomes:gold_overlay";
- public static String iron_overlay = "undergroundbiomes:iron_overlay";
- public static String lapis_overlay = "undergroundbiomes:lapis_overlay";
- public static String lead_overlay = "undergroundbiomes:lead_overlay";
- public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay";
- public static String redstone_overlay = "undergroundbiomes:redstone_overlay";
- public static String ruby_overlay = "undergroundbiomes:ruby_overlay";
- public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay";
- public static String tin_overlay = "undergroundbiomes:tin_overlay";
- public static String uranium_overlay = "undergroundbiomes:uranium_overlay";
+ String amber_overlay = "undergroundbiomes:amber_overlay";
+ String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay";
+ String coal_overlay = "undergroundbiomes:coal_overlay";
+ String copper_overlay = "undergroundbiomes:copper_overlay";
+ String diamond_overlay = "undergroundbiomes:diamond_overlay";
+ String emerald_overlay = "undergroundbiomes:emerald_overlay";
+ String gold_overlay = "undergroundbiomes:gold_overlay";
+ String iron_overlay = "undergroundbiomes:iron_overlay";
+ String lapis_overlay = "undergroundbiomes:lapis_overlay";
+ String lead_overlay = "undergroundbiomes:lead_overlay";
+ String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay";
+ String redstone_overlay = "undergroundbiomes:redstone_overlay";
+ String ruby_overlay = "undergroundbiomes:ruby_overlay";
+ String sapphire_overlay = "undergroundbiomes:sapphire_overlay";
+ String tin_overlay = "undergroundbiomes:tin_overlay";
+ String uranium_overlay = "undergroundbiomes:uranium_overlay";
 
- public class BlocksAreAlreadySet extends RuntimeException {
+ class BlocksAreAlreadySet extends RuntimeException {
  // this is thrown if UB has already run its pre-initialization step and can no longer register blocks
  public final Block oreBlock;
  public final String overlayName;

src/main/java/tconstruct/TConstruct.java

@@ -51,7 +51,6 @@
 import tconstruct.plugins.waila.TinkerWaila;
 import tconstruct.smeltery.TinkerSmeltery;
 import tconstruct.tools.TinkerTools;
-import tconstruct.util.EnvironmentChecks;
 import tconstruct.util.IMCHandler;
 import tconstruct.util.config.DimensionBlacklist;
 import tconstruct.util.config.PHConstruct;
@@ -122,8 +121,6 @@ public TConstruct() {
  } else {
  logger.info("Preparing to take over the world");
  }
-
- EnvironmentChecks.verifyEnvironmentSanity();
  }
 
  // Force the client and server to have or not have this mod
@@ -206,9 +203,9 @@ public void preInit(FMLPreInitializationEvent event) {
  @EventHandler
  public void init(FMLInitializationEvent event) {
  packetPipeline.initalise();
- if (event.getSide() == Side.CLIENT) {
-  // MinecraftForge.EVENT_BUS.register(new EventCloakRender());
- }
+ // if (event.getSide() == Side.CLIENT) {
+ // MinecraftForge.EVENT_BUS.register(new EventCloakRender());
+ // }
 
  DimensionBlacklist.getBadBimensions();
  GameRegistry.registerWorldGenerator(new SlimeIslandGen(TinkerWorld.slimePool, 2), 2);

src/main/java/tconstruct/achievements/AchievementEvents.java

@@ -24,8 +24,7 @@ public void toolCreate(ToolCraftedEvent event) {
  TAchievements.triggerAchievement(event.player, "tconstruct.preparedFight");
  }
 
- if (event.inventory != null
- && event.inventory instanceof ToolForgeLogic
+ if (event.inventory instanceof ToolForgeLogic
  && event.tool.getItem() instanceof ToolCore
  && ((ToolCore) event.tool.getItem()).durabilityTypeExtra() != 0) {
  TAchievements.triggerAchievement(event.player, "tconstruct.proTinkerer");

src/main/java/tconstruct/achievements/TAchievements.java

@@ -13,7 +13,7 @@
 public class TAchievements {
 
  private static AchievementPage achievementsPage;
- private static HashMap<String, Achievement> achievementsList = new HashMap<String, Achievement>();
+ private static final HashMap<String, Achievement> achievementsList = new HashMap<>();
 
  /**
  * Adds an achievement and registers it, so there is no need to call .registerStat

src/main/java/tconstruct/achievements/items/CraftAchievementItem.java

@@ -8,7 +8,7 @@
 import tconstruct.achievements.TAchievements;
 
 public class CraftAchievementItem extends CraftingItem {
- public String grantedAchievement = "";
+ public String grantedAchievement;
 
  public CraftAchievementItem(
  String[] names,

src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java

@@ -4,7 +4,7 @@
 import net.minecraft.inventory.IInventory;
 
 public interface IPlayerExtendedInventoryWrapper {
- public IInventory getKnapsackInventory(EntityPlayer player);
+ IInventory getKnapsackInventory(EntityPlayer player);
 
- public IInventory getAccessoryInventory(EntityPlayer player);
+ IInventory getAccessoryInventory(EntityPlayer player);
 }

src/main/java/tconstruct/armor/ArmorAbilities.java

@@ -16,7 +16,7 @@
 import tconstruct.util.network.HealthUpdatePacket;
 
 public class ArmorAbilities {
- public static List<String> stepBoostedPlayers = new ArrayList();
+ public static List<String> stepBoostedPlayers = new ArrayList<>();
  // ItemStack prevFeet;
  double prevMotionY;
 
@@ -77,7 +77,7 @@ public void playerTick(TickEvent.PlayerTickEvent event) {
 
  @SubscribeEvent
  public void dimensionChanged(PlayerEvent.PlayerChangedDimensionEvent event) {
- if (event.player == null || !(event.player instanceof EntityPlayerMP)) return;
+ if (!(event.player instanceof EntityPlayerMP)) return;
 
  // this callback is only called serverside
  float oldHealth = event.player.getHealth();