From b6368490a3d910bcff1837b15f44bd78411d37bd Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:04:31 +1000
Subject: + Added Custom tooltips to Items with Hazmat bonuses granted by GT++.
 + Made AutoMap implement List. % More work on HazmatUtils.java. $ Fixed a bug
 with my GeneralTooltipEventHandler.

---
 .../core/handler/events/GeneralTooltipEventHandler.java    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/handler')

diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index ef91647c1a..5b49b495ce 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -1,22 +1,16 @@
 package gtPlusPlus.core.handler.events;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
 import gregtech.api.enums.ItemList;
-import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public class GeneralTooltipEventHandler {
@@ -29,7 +23,7 @@ public class GeneralTooltipEventHandler {
 	public void onItemTooltip(ItemTooltipEvent event){
 
 		
-		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
+		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED || GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
 			return;
 		}
 		if (event.itemStack == null) {
-- 
cgit 


From 08e93930faa225c4bcd91115160e91671aaa4884 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 8 Apr 2019 16:41:11 +1000
Subject: $ Finished work on HazmatUtils.java. < Reverted the changes to
 GeneralTooltipEventHandler.java.

---
 src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/handler')

diff --git a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 5b49b495ce..fda7760607 100644
--- a/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -23,7 +23,7 @@ public class GeneralTooltipEventHandler {
 	public void onItemTooltip(ItemTooltipEvent event){
 
 		
-		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED || GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
+		if (GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.STARTED && GTplusplus.CURRENT_LOAD_PHASE != INIT_PHASE.SERVER_START) {
 			return;
 		}
 		if (event.itemStack == null) {
-- 
cgit 


From 0482091dd02c6305f2980d8df5533568875796fa Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Wed, 17 Apr 2019 15:39:22 +1000
Subject: + Added 4 more tiers of simple washers.

---
 src/Java/gtPlusPlus/core/handler/AchievementHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/handler')

diff --git a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
index 482ca66f09..4cd5431ebd 100644
--- a/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/AchievementHandler.java
@@ -71,7 +71,7 @@ public class AchievementHandler {
 		this.registerAchievement("rtg", -16, -10, GregtechItemList.RTG.get(1), aBaseAchievementName, false);
 		this.registerAchievement("dehydrate", -15, -10, GregtechItemList.GT_Dehydrator_HV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("semifluid", -14, -10, GregtechItemList.Generator_SemiFluid_HV.get(1), aBaseAchievementName, false);
-		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher.get(1), aBaseAchievementName, false);
+		this.registerAchievement("earlywasher", -13, -10, GregtechItemList.SimpleDustWasher_ULV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("advancedsteam", -12, -10, GregtechItemList.Boiler_Advanced_MV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("pollutionremoval", -11, -10, GregtechItemList.Pollution_Cleaner_IV.get(1), aBaseAchievementName, false);
 		this.registerAchievement("hiampxform", -10, -10, GregtechItemList.Transformer_HA_HV_MV.get(1), aBaseAchievementName, false);		
-- 
cgit