aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorAlastors <78517796+Alastors@users.noreply.github.com>2022-10-12 01:32:57 -0500
committerGitHub <noreply@github.com>2022-10-12 08:32:57 +0200
commit130a142be25fcdefab85d912ce401841dba59e5d (patch)
tree1e6907f13461acc8010d3adff6d40a9e1eef07a7 /src/main/java/gregtech
parent1018bcea246398fd07bffcbb1724d00b4d728e65 (diff)
downloadGT5-Unofficial-130a142be25fcdefab85d912ce401841dba59e5d.tar.gz
GT5-Unofficial-130a142be25fcdefab85d912ce401841dba59e5d.tar.bz2
GT5-Unofficial-130a142be25fcdefab85d912ce401841dba59e5d.zip
Revert the change to Paperbark trees, also removes harvestcraft from dependency (#1459)
* Update dependencies.gradle * Update GT_Mod.java * Delete Harvestcraft.java
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/GT_Mod.java2
-rw-r--r--src/main/java/gregtech/crossmod/Harvestcraft.java17
2 files changed, 0 insertions, 19 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 351895636e..1f2591f2a2 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -57,7 +57,6 @@ import gregtech.common.entities.GT_Entity_Arrow;
import gregtech.common.entities.GT_Entity_Arrow_Potion;
import gregtech.common.misc.GT_Command;
import gregtech.common.tileentities.storage.GT_MetaTileEntity_DigitalChestBase;
-import gregtech.crossmod.Harvestcraft;
import gregtech.crossmod.Waila;
import gregtech.loaders.load.GT_CoverBehaviorLoader;
import gregtech.loaders.load.GT_FuelLoader;
@@ -320,7 +319,6 @@ public class GT_Mod implements IGT_Mod {
new GT_FuelLoader().run();
}
Waila.init();
- Harvestcraft.init();
IMCForNEI.IMCSender();
GregTech_API.sLoadFinished = true;
GT_Log.out.println("GT_Mod: Load-Phase finished!");
diff --git a/src/main/java/gregtech/crossmod/Harvestcraft.java b/src/main/java/gregtech/crossmod/Harvestcraft.java
deleted file mode 100644
index b97f4efcdc..0000000000
--- a/src/main/java/gregtech/crossmod/Harvestcraft.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package gregtech.crossmod;
-
-import com.pam.harvestcraft.BlockPamFruitingLog;
-import com.pam.harvestcraft.BlockRegistry;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-
-public class Harvestcraft {
- public static void init() {
- if (!Loader.isModLoaded("harvestcraft")) return;
-
- ((BlockPamFruitingLog) BlockRegistry.pamPaperbark)
- .setDropItem(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Paper, 1));
- }
-}