From 5d15dce9293f7c37089be3adfe0768de425838e2 Mon Sep 17 00:00:00 2001
From: Jordan Byrne <draknyte1@hotmail.com>
Date: Wed, 21 Feb 2018 14:38:10 +1000
Subject: $ Tree Farmer Work. % Package cleanup. - Removed /Bed command.

---
 .../core/world/damage/BaseCustomDamageSource.java  | 22 ++++++++++++++++++++++
 .../world/darkworld/gen/gt/WorldGen_GT_Base.java   |  2 +-
 .../core/world/darkworld/gen/gt/WorldGen_Ores.java |  4 ++--
 .../core/world/darkworld/object/BoxedQuad.java     |  2 +-
 .../core/world/explosions/MiningExplosion.java     |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java

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

diff --git a/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java b/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java
new file mode 100644
index 0000000000..3778beacfb
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java
@@ -0,0 +1,22 @@
+package gtPlusPlus.core.world.damage;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.EntityDamageSourceIndirect;
+
+public class BaseCustomDamageSource extends EntityDamageSourceIndirect  {
+
+	public BaseCustomDamageSource(String name, Entity transmitter, Entity indirectSource) {
+	    super(name, transmitter, indirectSource);
+	    this.setDifficultyScaled();
+	}
+	
+	 /**
+     * Return whether this damage source will have its damage amount scaled based on the current difficulty.
+     */
+    public boolean isDifficultyScaled()
+    {
+    	return true;
+    }
+
+    
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 6be899e5de..301a2154c2 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -6,7 +6,7 @@ import cpw.mods.fml.common.IWorldGenerator;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Log;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
index 4b099ee4cf..8b28e2d4e8 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java
@@ -4,12 +4,12 @@ import java.util.Hashtable;
 
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gtPlusPlus.api.objects.MaterialHelper;
+import gtPlusPlus.api.helpers.MaterialHelper;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.material.ELEMENT;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.ORES;
 import gtPlusPlus.core.material.nuclear.FLUORIDES;
-import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.materials.MaterialUtils;
 import gtPlusPlus.core.world.darkworld.object.BoxedQuad;
 import net.minecraft.block.Block;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
index d3c400896b..fd3d734e08 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java
@@ -1,6 +1,6 @@
 package gtPlusPlus.core.world.darkworld.object;
 
-import gtPlusPlus.core.util.array.Pair;
+import gtPlusPlus.api.objects.data.Pair;
 import net.minecraft.block.Block;
 
 public class BoxedQuad<K,V,C,R> {
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index 50fa08f55f..bcbb16a3b6 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.world.explosions;
 
 import java.util.*;
 
-import gtPlusPlus.api.objects.XSTR;
+import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 import gtPlusPlus.core.util.math.MathUtils;
 import net.minecraft.block.Block;
-- 
cgit