diff options
Diffstat (limited to 'groovy/postInit')
| -rw-r--r-- | groovy/postInit/disabled-items.groovy | 157 | ||||
| -rw-r--r-- | groovy/postInit/gregtech.groovy | 70 | ||||
| -rw-r--r-- | groovy/postInit/oredicts.groovy | 4 | ||||
| -rw-r--r-- | groovy/postInit/recipes.groovy | 2 | ||||
| -rw-r--r-- | groovy/postInit/tools.groovy | 25 | 
5 files changed, 127 insertions, 131 deletions
| diff --git a/groovy/postInit/disabled-items.groovy b/groovy/postInit/disabled-items.groovy index a065df0..0fab9e7 100644 --- a/groovy/postInit/disabled-items.groovy +++ b/groovy/postInit/disabled-items.groovy @@ -1,203 +1,202 @@ -  //Disable duplicate items from JEI  for (i in [  	//Iron dust -	item('appliedenergistics2:material', 49), -	item('enderio:item_material', 24), +	item("appliedenergistics2:material", 49), +	item("enderio:item_material", 24),  	//Gold dust -	item('appliedenergistics2:material', 51), -	item('enderio:item_material', 25), +	item("appliedenergistics2:material", 51), +	item("enderio:item_material", 25),  	//Diamond dust -	item('nuclearcraft:gem_dust'), +	item("nuclearcraft:gem_dust"),  	//Coal dust -	item('enderio:item_material', 23), -	item('nuclearcraft:gem_dust', 7), +	item("enderio:item_material", 23), +	item("nuclearcraft:gem_dust", 7),  	//Obsidian dust -	item('enderio:item_material', 29), -	item('nuclearcraft:gem_dust', 3), +	item("enderio:item_material", 29), +	item("nuclearcraft:gem_dust", 3),  	//Lapis dust -	item('enderio:item_material', 32), +	item("enderio:item_material", 32),  	//Ender pearl dust -	item('enderio:item_material', 28), -	item('appliedenergistics2:material', 46), +	item("enderio:item_material", 28), +	item("appliedenergistics2:material", 46),  	//Quartz dust -	item('enderio:item_material', 33), -	item('nuclearcraft:gem_dust', 2), +	item("enderio:item_material", 33), +	item("nuclearcraft:gem_dust", 2),  	//End stone dust -	item('nuclearcraft:gem_dust', 11), +	item("nuclearcraft:gem_dust", 11),  	//Arsenic dust -	item('nuclearcraft:gem_dust', 10), +	item("nuclearcraft:gem_dust", 10),  	//Copper ingot -	item('forestry:ingot_copper'), -	item('nuclearcraft:ingot'), -	item('projectred-core:resource_item', 100), +	item("forestry:ingot_copper"), +	item("nuclearcraft:ingot"), +	item("projectred-core:resource_item", 100),  	//Copper block -	item('forestry:resource_storage', 1), -	item('nuclearcraft:ingot_block'), +	item("forestry:resource_storage", 1), +	item("nuclearcraft:ingot_block"),  	//Copper dust -	item('nuclearcraft:dust'), -	item('enderio:item_material', 26), +	item("nuclearcraft:dust"), +	item("enderio:item_material", 26),  	//Copper gear -	item('forestry:gear_copper'), +	item("forestry:gear_copper"),  	//Tin ingot -	item('forestry:ingot_tin'), -	item('nuclearcraft:ingot', 1), -	item('projectred-core:resource_item', 101), +	item("forestry:ingot_tin"), +	item("nuclearcraft:ingot", 1), +	item("projectred-core:resource_item", 101),  	//Tin block -	item('forestry:resource_storage', 2), -	item('nuclearcraft:ingot_block', 1), +	item("forestry:resource_storage", 2), +	item("nuclearcraft:ingot_block", 1),  	//Tin dust -	item('nuclearcraft:dust', 1), -	item('enderio:item_material', 27), +	item("nuclearcraft:dust", 1), +	item("enderio:item_material", 27),  	//Tin gear -	item('forestry:gear_tin'), +	item("forestry:gear_tin"),  	//Bronze ingot -	item('forestry:ingot_bronze'), -	item('nuclearcraft:alloy'), +	item("forestry:ingot_bronze"), +	item("nuclearcraft:alloy"),  	//Bronze block -	item('forestry:resource_storage', 3), +	item("forestry:resource_storage", 3),  	//Bronze gear -	item('forestry:gear_bronze'), +	item("forestry:gear_bronze"),  	//Steel ingot -	item('nuclearcraft:alloy', 5), +	item("nuclearcraft:alloy", 5),  	//Lead ingot -	item('nuclearcraft:ingot', 2), +	item("nuclearcraft:ingot", 2),  	//Lead block -	item('nuclearcraft:ingot_block', 2), +	item("nuclearcraft:ingot_block", 2),  	//Lead dust -	item('nuclearcraft:dust', 2), +	item("nuclearcraft:dust", 2),  	//Aluminium ingot -	item('nuclearcraft:ingot', 12), +	item("nuclearcraft:ingot", 12),  	//Aluminium block -	item('nuclearcraft:ingot_block', 12), +	item("nuclearcraft:ingot_block", 12),  	//Aluminium dust -	item('nuclearcraft:dust', 12), +	item("nuclearcraft:dust", 12),  	//Silver ingot -	item('nuclearcraft:ingot', 13), -	item('projectred-core:resource_item', 102), +	item("nuclearcraft:ingot", 13), +	item("projectred-core:resource_item", 102),  	//Silver block -	item('nuclearcraft:ingot_block', 13), +	item("nuclearcraft:ingot_block", 13),  	//Platinum ingot -	item('qmd:ingot', 10), +	item("qmd:ingot", 10),  	//Platinum dust -	item('qmd:dust', 10), +	item("qmd:dust", 10),  	//Stainless steel ingot -	item('qmd:ingot_alloy', 2), +	item("qmd:ingot_alloy", 2),  	//Beryllium ingot -	item('nuclearcraft:ingot', 9), +	item("nuclearcraft:ingot", 9),  	//Beryllium dust -	item('nuclearcraft:dust', 9), +	item("nuclearcraft:dust", 9),  	//Manganese ingot -	item('nuclearcraft:ingot', 11), +	item("nuclearcraft:ingot", 11),  	//Manganese block -	item('nuclearcraft:ingot_block', 11), +	item("nuclearcraft:ingot_block", 11),  	//Manganese dust -	item('nuclearcraft:dust', 11), +	item("nuclearcraft:dust", 11),  	//Magnesium-diboride ingot -	item('nuclearcraft:alloy', 3), +	item("nuclearcraft:alloy", 3),  	//Osmiridium ingot -	item('qmd:ingot_alloy', 4), +	item("qmd:ingot_alloy", 4),  	//Red alloy ingot -	item('projectred-core:resource_item', 103), +	item("projectred-core:resource_item", 103),  	//Niobium-titanium ingot -	item('qmd:ingot_alloy', 3), +	item("qmd:ingot_alloy", 3),  	//Nichrome ingot -	item('qmd:ingot_alloy', 5), +	item("qmd:ingot_alloy", 5),  	//Iridium ingot -	item('qmd:ingot', 9), +	item("qmd:ingot", 9),  	//Iridium dust -	item('qmd:dust', 9), +	item("qmd:dust", 9),  	//Titanium ingot -	item('qmd:ingot', 3), +	item("qmd:ingot", 3),  	//Tungsten ingot -	item('qmd:ingot'), +	item("qmd:ingot"),  	//Tungsten dust -	item('qmd:dust'), +	item("qmd:dust"),  	//Niobium ingot -	item('qmd:ingot', 1), +	item("qmd:ingot", 1),  	//Niobium dust -	item('qmd:dust', 1), +	item("qmd:dust", 1),  	//Cobalt ingot -	item('qmd:ingot', 4), +	item("qmd:ingot", 4),  	//Cobalt dust -	item('qmd:dust', 4), -	item('enderio:item_material', 31), +	item("qmd:dust", 4), +	item("enderio:item_material", 31),  	//Nickel ingot -	item('qmd:ingot', 5), +	item("qmd:ingot", 5),  	//Nickel dust -	item('qmd:dust', 5), +	item("qmd:dust", 5),  	//Zinc ingot -	item('qmd:ingot', 7), +	item("qmd:ingot", 7),  	//Zinc dust -	item('qmd:dust', 7), +	item("qmd:dust", 7),  	//Yttrium ingot -	item('qmd:ingot2'), +	item("qmd:ingot2"),  	//Yttrium dust -	item('qmd:dust2'), +	item("qmd:dust2"),  	//Neodymium ingot -	item('qmd:ingot2', 1), +	item("qmd:ingot2", 1),  	//Neodymium dust -	item('qmd:dust2', 1) +	item("qmd:dust2", 1)  ]) { -	mods.jei.ingredient.yeet(i); +	mods.jei.ingredient.yeet(i)  } diff --git a/groovy/postInit/gregtech.groovy b/groovy/postInit/gregtech.groovy index bb7537f..c8788b8 100644 --- a/groovy/postInit/gregtech.groovy +++ b/groovy/postInit/gregtech.groovy @@ -1,122 +1,122 @@ -furnace.add(metaitem("rubber_drop"), metaitem("dustRawRubber")*2); -funace.add(metaitem("dustRawRubber"), metaitem("ingotRubber")); +furnace.add(metaitem("rubber_drop"), metaitem("dustRawRubber")*2) +furnace.add(metaitem("dustRawRubber"), metaitem("ingotRubber"))  //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 LV circuit recipe -crafting.replaceShaped(metaitem('circuit.electronic'), [ -	[metaitem('component.resistor'),metaitem("plateIron"),metaitem('component.resistor')], -	[metaitem('circuit.vacuum_tube'),metaitem('circuit_board.basic'),metaitem('circuit.vacuum_tube')], -	[metaitem('cableGtSingleRedAlloy'),metaitem('cableGtSingleRedAlloy'),metaitem('cableGtSingleRedAlloy')] -]); +crafting.replaceShaped(metaitem("circuit.electronic"), [ +	[metaitem("component.resistor"),metaitem("plateIron"),metaitem("component.resistor")], +	[metaitem("circuit.vacuum_tube"),metaitem("circuit_board.basic"),metaitem("circuit.vacuum_tube")], +	[metaitem("cableGtSingleRedAlloy"),metaitem("cableGtSingleRedAlloy"),metaitem("cableGtSingleRedAlloy")] +])  //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")] -]); +]) -crafting.addShaped(metaitem('compressed.fireclay')*8, [ -	[metaitem('dustFireclay'),metaitem('dustFireclay'),metaitem('dustFireclay')], -	[metaitem('dustFireclay'),metaitem('wooden_form.brick'),metaitem('dustFireclay')], -	[metaitem('dustFireclay'),metaitem('dustFireclay'),metaitem('dustFireclay')] -]); +crafting.addShaped(metaitem("compressed.fireclay")*8, [ +	[metaitem("dustFireclay"),metaitem("dustFireclay"),metaitem("dustFireclay")], +	[metaitem("dustFireclay"),metaitem("wooden_form.brick"),metaitem("dustFireclay")], +	[metaitem("dustFireclay"),metaitem("dustFireclay"),metaitem("dustFireclay")] +])  //Make steel production faster  // Steel Ingot * 1 -mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ingot'), item('minecraft:coal') * 2 * 2], null) +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) +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) +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) +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) +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.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(); +									.buildAndRegister()  mods.gregtech.primitive_blast_furnace.recipeBuilder()  									.inputs(item("minecraft:iron_ingot"), metaitem("dustCoal")*2)  									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)  									.duration(1200) -									.buildAndRegister(); +									.buildAndRegister()  mods.gregtech.primitive_blast_furnace.recipeBuilder() -									.inputs(item("minecraft:iron_ingot"), item('minecraft:coal', 1)) +									.inputs(item("minecraft:iron_ingot"), item("minecraft:coal", 1))  									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)  									.duration(1200) -									.buildAndRegister(); +									.buildAndRegister()  mods.gregtech.primitive_blast_furnace.recipeBuilder()  									.inputs(item("minecraft:iron_ingot"), metaitem("dustCharcoal"))  									.outputs(metaitem("ingotSteel"), metaitem("dustTinyDarkAsh")*2)  									.duration(1200) -									.buildAndRegister(); +									.buildAndRegister()  mods.gregtech.primitive_blast_furnace.recipeBuilder()  									.inputs(item("minecraft:iron_ingot"), metaitem("gemCoke"))  									.outputs(metaitem("ingotSteel"), metaitem("dustTinyAsh"))  									.duration(1000) -									.buildAndRegister(); +									.buildAndRegister()  mods.gregtech.primitive_blast_furnace.recipeBuilder()  									.inputs(item("minecraft:iron_ingot"), metaitem("dustCoke"))  									.outputs(metaitem("ingotSteel"), metaitem("dustTinyAsh"))  									.duration(1000) -									.buildAndRegister(); +									.buildAndRegister() -furnace.add(item("minecraft:iron_ingot"), metaitem("ingotWroughtIron")); +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.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(); +						.buildAndRegister() diff --git a/groovy/postInit/oredicts.groovy b/groovy/postInit/oredicts.groovy index 2439d83..6faa5bb 100644 --- a/groovy/postInit/oredicts.groovy +++ b/groovy/postInit/oredicts.groovy @@ -26,6 +26,6 @@ for (i in [  	"ingotRedAlloy"  ]) { -	oreDict.removeAll(i); -	oreDict.add(i, metaitem(i)); +	oreDict.removeAll(i) +	oreDict.add(i, metaitem(i))  } diff --git a/groovy/postInit/recipes.groovy b/groovy/postInit/recipes.groovy index aee47c2..7193a56 100644 --- a/groovy/postInit/recipes.groovy +++ b/groovy/postInit/recipes.groovy @@ -1 +1 @@ -crafting.addShapeless(item("minecraft:flint"), [item("minecraft:gravel"),item("minecraft:gravel"),item("minecraft:gravel")]); +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 index 95ce29f..0e35faf 100644 --- a/groovy/postInit/tools.groovy +++ b/groovy/postInit/tools.groovy @@ -1,6 +1,3 @@ - - -  for (def i in [  	item("minecraft:stone_sword"),  	item("minecraft:iron_sword"), @@ -27,8 +24,8 @@ for (def i in [  	item("minecraft:golden_hoe"),  	item("minecraft:diamond_hoe")  ]) { -	crafting.removeByOutput(i); -	mods.jei.ingredient.yeet(i); +	crafting.removeByOutput(i) +	mods.jei.ingredient.yeet(i)  }  for (def i in [ @@ -41,7 +38,7 @@ for (def i in [  	item("gregtech:spade"),  	item("gregtech:scythe")  ]) { -	crafting.removeByOutput(i); +	crafting.removeByOutput(i)  }  for (def i in [ @@ -73,27 +70,27 @@ for (def i in [  		[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": [ @@ -110,7 +107,7 @@ for (def i in [  			[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, @@ -125,7 +122,7 @@ for (def i in [  			[null, i.value, null],  			[i.value, ore("stickWood"), i.value],  			[null, ore("stickWood"), null] -		]); +		])  		crafting.addShaped(item("gregtech:scythe").withNbt([  		"GT.Behaviours": [  			"AoELayer": 2, @@ -140,7 +137,7 @@ for (def i in [  			[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]]) | 
