Update GregTechCE dependency to 1.15+ (#150)

* Require GTCE version 1.15.0.721 for build and at least that version for runtime * Remove our tweaks to dust un-crafting recipes which are no longer necessary due to GregTechCE/GregTech#1596
Shadows-of-Fire · May 20, 2021 · 7b932b5 · 7b932b5
1 parent da9250a
commit 7b932b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,7 +73,7 @@ dependencies {
     deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+"
     deobfCompile "mezz.jei:jei_1.12.2:+"
     deobfCompile "net.sengir.forestry:forestry_1.12.2:+"
-    deobfCompile "gregtechce:gregtech:1.12.2:1.14.1.705"
+    deobfCompile "gregtechce:gregtech:1.12.2:1.15.0.721"
     deobfCompile "codechicken:ChickenASM:1.12-+"
     deobfCompile "codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.357:universal"
     deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.3.42"

diff --git a/src/main/java/gregicadditions/GregicAdditions.java b/src/main/java/gregicadditions/GregicAdditions.java
@@ -37,7 +37,7 @@
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.registries.IForgeRegistry;
 
-@Mod(modid = GregicAdditions.MODID, name = GregicAdditions.NAME, version = GregicAdditions.VERSION, dependencies = "required-after:gregtech@[1.14.0.689,);after:forestry;after:tconstruct;")
+@Mod(modid = GregicAdditions.MODID, name = GregicAdditions.NAME, version = GregicAdditions.VERSION, dependencies = "required-after:gregtech@[1.15.0.721,);after:forestry;after:tconstruct;")
 public class GregicAdditions {
 	public static final String MODID = "gtadditions";
 	public static final String NAME = "Shadows of Greg";

diff --git a/src/main/java/gregicadditions/recipes/GARecipeAddition.java b/src/main/java/gregicadditions/recipes/GARecipeAddition.java
@@ -617,14 +617,6 @@ public static void init2() {
 		RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2).input(OrePrefix.dust, Materials.NetherQuartz).outputs(OreDictUnifier.get(OrePrefix.plate, Materials.NetherQuartz)).buildAndRegister();
 		RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder().duration(400).EUt(2).input(OrePrefix.dust, Materials.CertusQuartz).outputs(OreDictUnifier.get(OrePrefix.plate, Materials.CertusQuartz)).buildAndRegister();
 
-		//Dust Uncrafting Fixes
-		for (Material m : Material.MATERIAL_REGISTRY) {
-			if (!OreDictUnifier.get(OrePrefix.dustSmall, m).isEmpty()) {
-				ModHandler.removeRecipes(OreDictUnifier.get(OrePrefix.dustSmall, m));
-				ModHandler.addShapedRecipe("dust_small_" + m.toString(), OreDictUnifier.get(OrePrefix.dustSmall, m, 4), " D", "  ", 'D', new UnificationEntry(OrePrefix.dust, m));
-			}
-		}
-
 		ModHandler.addShapedRecipe("3x3_schematic", GAMetaItems.SCHEMATIC_3X3.getStackForm(), "  d", " S ", "   ", 'S', GAMetaItems.SCHEMATIC.getStackForm());
 		ModHandler.addShapedRecipe("2x2_schematic", GAMetaItems.SCHEMATIC_2X2.getStackForm(), " d ", " S ", "   ", 'S', GAMetaItems.SCHEMATIC.getStackForm());
 		ModHandler.addShapedRecipe("dust_schematic", GAMetaItems.SCHEMATIC_DUST.getStackForm(), "   ", " S ", "  d", 'S', GAMetaItems.SCHEMATIC.getStackForm());