disable vanilla tools and simplify bunch of recipes

4 files changed, 258 insertions, 2 deletions

diff --git a/groovy/postInit/gregtech.groovy b/groovy/postInit/gregtech.groovy
new file mode 100644
index 0000000..4c334f4
--- /dev/null
+++ b/groovy/postInit/gregtech.groovy
@@ -0,0 +1,111 @@
+
+
+furnace.add(metaitem("rubber_drop"), metaitem("dustRawRubber")*2);
+
+//Simplify coated circuit board recipe
+crafting.replaceShaped(metaitem("board.coated")*3, [
+	[metaitem("rubber_drop"),metaitem("rubber_drop"),metaitem("rubber_drop")],
+	[ore("plankWood"), ore("plankWood"), ore("plankWood")],
+	[metaitem("rubber_drop"),metaitem("rubber_drop"),metaitem("rubber_drop")]
+]);
+
+crafting.replaceShaped(metaitem("board.coated"), [
+	[ore("plankWood"),metaitem("rubber_drop")],
+	[metaitem("rubber_drop"), null]
+]);
+
+//Simplify coke oven
+crafting.replaceShaped(metaitem("coke_oven"), [
+	[metaitem("brick.coke"), metaitem("brick.coke"), metaitem("brick.coke")],
+	[metaitem("brick.coke"), null, metaitem("brick.coke")],
+	[metaitem("brick.coke"), metaitem("brick.coke"), metaitem("brick.coke")]
+]);
+
+//Buff coke bricks
+crafting.replaceShaped("gregtech:compressed_coke_clay", metaitem("compressed.coke_clay")*8, [
+	[item("minecraft:clay_ball"),item("minecraft:clay_ball"),item("minecraft:clay_ball")],
+	[item("minecraft:sand"),metaitem("wooden_form.brick"),item("minecraft:sand")],
+	[item("minecraft:sand"),item("minecraft:sand"),item("minecraft:sand")]
+]);
+
+//Simplify primitive blast furnace
+crafting.replaceShaped(metaitem("primitive_blast_furnace.bronze"), [
+	[metaitem("brick.fireclay"), metaitem("brick.fireclay"), metaitem("brick.fireclay")],
+	[metaitem("brick.fireclay"), null, metaitem("brick.fireclay")],
+	[metaitem("brick.fireclay"), metaitem("brick.fireclay"), metaitem("brick.fireclay")]
+]);
+
+crafting.replaceShaped("gregtech:clay_ball_to_dust", metaitem("dustClay"), [
+	[item("gregtech:mortar"), item("minecraft:clay_ball")]
+]);
+
+crafting.replaceShaped("gregtech:brick_to_dust", metaitem("dustBrick"), [
+	[item("gregtech:mortar"), item("minecraft:brick")]
+]);
+
+
+//Make steel production faster
+
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), item('minecraft:coal') * 2 * 2], null)
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), metaitem('dustCoal') * 2], null)
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), item('minecraft:coal', 1) * 2 * 2], null)
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), metaitem('dustCharcoal') * 2], null)
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), metaitem('gemCoke')], null)
+// Steel Ingot * 1
+mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), metaitem('dustCoke')], null)
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), item("minecraft:coal")*2)
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)
+									.duration(1200)
+									.buildAndRegister();
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), metaitem("dustCoal")*2)
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)
+									.duration(1200)
+									.buildAndRegister();
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), item('minecraft:coal', 1))
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)
+									.duration(1200)
+									.buildAndRegister();
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), metaitem("dustCharcoal"))
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)
+									.duration(1200)
+									.buildAndRegister();
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), metaitem("gemCoke"))
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyAsh"))
+									.duration(1000)
+									.buildAndRegister();
+
+mods.gregtech.primitive_blast_furnace.recipeBuilder()
+									.inputs(item("minecraft:iron_ingot"), metaitem("dustCoke"))
+									.outputs(metaitem("ingotSteel"), metaitem("dustTinyAsh"))
+									.duration(1000)
+									.buildAndRegister();
+
+furnace.add(item("minecraft:iron_ingot"), metaitem("ingotWroughtIron"));
+
+
+//Make uranium production faster
+
+// Uraninite Dust * 3
+mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustPitchblende') * 5], null)
+
+mods.gregtech.centrifuge.recipeBuilder()
+						.inputs(metaitem("dustPitchblende")*5)
+						.outputs(metaitem("dustUraninite")*3, metaitem("dustThorium"), metaitem("dustLead"))
+						.EUt(32)
+						.duration(100)
+						.buildAndRegister();
diff --git a/groovy/postInit/oredicts.groovy b/groovy/postInit/oredicts.groovy
index cb34797..2439d83 100644
--- a/groovy/postInit/oredicts.groovy
+++ b/groovy/postInit/oredicts.groovy
@@ -29,5 +29,3 @@ for (i in [
 	oreDict.removeAll(i);
 	oreDict.add(i, metaitem(i));
 }
-
-crafting.removeByOutput(item("gregtech:pickaxe"));
diff --git a/groovy/postInit/recipes.groovy b/groovy/postInit/recipes.groovy
new file mode 100644
index 0000000..aee47c2
--- /dev/null
+++ b/groovy/postInit/recipes.groovy
@@ -0,0 +1 @@
+crafting.addShapeless(item("minecraft:flint"), [item("minecraft:gravel"),item("minecraft:gravel"),item("minecraft:gravel")]);
diff --git a/groovy/postInit/tools.groovy b/groovy/postInit/tools.groovy
new file mode 100644
index 0000000..95ce29f
--- /dev/null
+++ b/groovy/postInit/tools.groovy
@@ -0,0 +1,146 @@
+
+
+
+for (def i in [
+	item("minecraft:stone_sword"),
+	item("minecraft:iron_sword"),
+	item("minecraft:golden_sword"),
+	item("minecraft:diamond_sword"),
+
+	item("minecraft:stone_pickaxe"),
+	item("minecraft:iron_pickaxe"),
+	item("minecraft:golden_pickaxe"),
+	item("minecraft:diamond_pickaxe"),
+
+	item("minecraft:stone_axe"),
+	item("minecraft:iron_axe"),
+	item("minecraft:golden_axe"),
+	item("minecraft:diamond_axe"),
+
+	item("minecraft:stone_shovel"),
+	item("minecraft:iron_shovel"),
+	item("minecraft:golden_shovel"),
+	item("minecraft:diamond_shovel"),
+
+	item("minecraft:stone_hoe"),
+	item("minecraft:iron_hoe"),
+	item("minecraft:golden_hoe"),
+	item("minecraft:diamond_hoe")
+]) {
+	crafting.removeByOutput(i);
+	mods.jei.ingredient.yeet(i);
+}
+
+for (def i in [
+	item("gregtech:sword"),
+	item("gregtech:pickaxe"),
+	item("gregtech:axe"),
+	item("gregtech:shovel"),
+	item("gregtech:hoe"),
+	item("gregtech:mining_hammer"),
+	item("gregtech:spade"),
+	item("gregtech:scythe")
+]) {
+	crafting.removeByOutput(i);
+}
+
+for (def i in [
+	"gregtech:flint" : item("minecraft:flint"),
+	"gregtech:iron" : item("minecraft:iron_ingot"),
+	"gregtech:wrought_iron" : metaitem("ingotWroughtIron"),
+	"gregtech:bronze" : metaitem("ingotBronze"),
+	"gregtech:steel" : metaitem("ingotSteel"),
+	"gregtech:duranium" : metaitem("ingotDuranium"),
+	"gregtech:tungsten_steel" : metaitem("ingotTungstenSteel"),
+	"gregtech:cobalt_brass" : metaitem("ingotCobaltBrass"),
+	"gregtech:invar" : metaitem("ingotInvar"),
+	"gregtech:aluminium" : metaitem("ingotAluminium"),
+	"gregtech:sterling_silver" : metaitem("ingotSterlingSilver"),
+	"gregtech:tungsten_carbide" : metaitem("ingotTungstenCarbide"),
+	"gregtech:rose_gold" : metaitem("ingotRoseGold"),
+	"gregtech:damascus_steel" : metaitem("ingotDamascusSteel"),
+	"gregtech:titanium" : metaitem("ingotTitanium"),
+	"gregtech:ultimet" : metaitem("ingotUltimet"),
+	"gregtech:hsse" : metaitem("ingotHsse"),
+	"gregtech:neutronium" : metaitem("ingotNeutronium"),
+	"gregtech:vanadium_steel" : metaitem("ingotVanadiumSteel"),
+	"gregtech:red_steel" : metaitem("ingotRedSteel"),
+	"gregtech:naquadah_alloy" : metaitem("ingotNaquadahAlloy"),
+	"gregtech:blue_steel" : metaitem("ingotBlueSteel"),
+	"gregtech:stainless_steel" : metaitem("ingotStainlessSteel")
+]) {
+	crafting.addShaped(item("gregtech:sword").withNbt(["GT.Tool": ["Material": i.key]]), [
+		[null, i.value, null],
+		[null, i.value, null],
+		[null, ore("stickWood"), null]
+	]);
+	crafting.addShaped(item("gregtech:pickaxe").withNbt(["GT.Tool": ["Material": i.key]]), [
+		[i.value, i.value, i.value],
+		[null, ore("stickWood"), null],
+		[null, ore("stickWood"), null]
+	]);
+	crafting.addShaped(item("gregtech:axe").withNbt(["GT.Tool": ["Material": i.key]]), [
+		[i.value, i.value, null],
+		[i.value, ore("stickWood"), null],
+		[null, ore("stickWood"), null]
+	]);
+	crafting.addShaped(item("gregtech:shovel").withNbt(["GT.Tool": ["Material": i.key]]), [
+		[null, i.value, null],
+		[null, ore("stickWood"), null],
+		[null, ore("stickWood"), null]
+	]);
+	crafting.addShaped(item("gregtech:hoe").withNbt(["GT.Tool": ["Material": i.key]]), [
+		[i.value, i.value, null],
+		[null, ore("stickWood"), null],
+		[null, ore("stickWood"), null]
+	]);
+	if (i.key!="gregtech:flint") {
+		crafting.addShaped(item("gregtech:mining_hammer").withNbt([
+		"GT.Behaviours": [
+			"AoELayer": 0,
+			"MaxAoELayer": 0,
+			"TorchPlacing": (byte) 1,
+			"AoERow": 1,
+			"AoEColumn": 1,
+			"MaxAoERow": 1,
+			"MaxAoEColumn": 1
+		],
+		"GT.Tool": ["Material": i.key]]
+		), [
+			[i.value, i.value, i.value],
+			[i.value, ore("stickWood"), i.value],
+			[null, ore("stickWood"), null]
+		]);
+		crafting.addShaped(item("gregtech:spade").withNbt([
+		"GT.Behaviours": [
+			"AoELayer": 0,
+			"MaxAoELayer": 0,
+			"AoERow": 1,
+			"AoEColumn": 1,
+			"MaxAoERow": 1,
+			"MaxAoEColumn": 1
+		],
+		"GT.Tool": ["Material": i.key]]
+		), [
+			[null, i.value, null],
+			[i.value, ore("stickWood"), i.value],
+			[null, ore("stickWood"), null]
+		]);
+		crafting.addShaped(item("gregtech:scythe").withNbt([
+		"GT.Behaviours": [
+			"AoELayer": 2,
+			"MaxAoELayer": 2,
+			"AoERow": 2,
+			"AoEColumn": 2,
+			"MaxAoERow": 2,
+			"MaxAoEColumn": 2
+		],
+		"GT.Tool": ["Material": i.key]]
+		), [
+			[i.value, i.value, i.value],
+			[null, null, ore("stickWood")],
+			[null, null, ore("stickWood")]
+		]);
+	}
+}
+item("gregtech:mining_hammer").withNbt(["GT.Behaviours": ["AoELayer": 0, "MaxAoELayer": 0, "TorchPlacing": (byte) 1, "AoERow": 1, "AoEColumn": 1, "MaxAoERow": 1, "MaxAoEColumn": 1], "HideFlags": 2, "GT.Tool": ["MaxDurability": 767, "ToolSpeed": 4.8F, "AttackDamage": 3.5F, "Durability": 0, "Material": "gregtech:iron", "HarvestLevel": 2, "AttackSpeed": -3.2F]])