TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Depreciate custom GT tool oreDicts (#250)

Browse Source 
* deprecicate-custom-tool-oreDicts

* Rename wrenchCustom oredict to wrenches
This commit is contained in:
IntegerLimit 2023-03-07 12:12:37 +11:00 committed by GitHub
parent 10627554f2
commit 950929a949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overrides/scripts/AE2.zs
View File

@ -263,11 +263,11 @@ recipes.addShaped(<appliedenergistics2:energy_acceptor>, [
//Fluix Plate
recipes.remove(<ore:plateFluix>);
//recipes.addShaped(<ore:plateFluix>, [
// [<ore:craftingToolHardHammer>],
// [<ore:toolHammer>],
// [<appliedenergistics2:material:7>],
// [<appliedenergistics2:material:7>]]);
//recipes.addShaped(<ore:plateFluix>, [
// [<ore:craftingToolHardHammer>],
// [<ore:toolHammer>],
// [<appliedenergistics2:material:12>],
// [<appliedenergistics2:material:12>]]);

6
overrides/scripts/CustomWrench.zs
View File

@ -3,12 +3,12 @@ import crafttweaker.player.IPlayer;
import crafttweaker.block.IBlockPattern;
import crafttweaker.event.PlayerInteractBlockEvent;
<ore:wrenchCustom>.add(<thermalfoundation:wrench>,
<ore:wrenches>.add(<thermalfoundation:wrench>,
<enderio:item_yeta_wrench>,
<redstonearsenal:tool.wrench_flux>,
<redstonearsenal:tool.battlewrench_flux>);
<ore:wrenchCustom>.addAll(<ore:gtceWrenches>);
<ore:wrenches>.addAll(<ore:toolWrench>);
static wrenchables as IBlockPattern = <thermalexpansion:tank> as IBlock |
<thermalexpansion:cell> as IBlock |
@ -27,7 +27,7 @@ function isNotWrenching(player as IPlayer) as bool {
return isNull(player) || // no player
!player.isSneaking || // not sneaking
isNull(player.currentItem) || // no item is held
!(<ore:wrenchCustom> has player.currentItem); // not a wrench
!(<ore:wrenches> has player.currentItem); // not a wrench
}
function playerIsNotWrenchingWrenchable(evt as PlayerInteractBlockEvent) as bool {

8
overrides/scripts/Earlygame.zs
View File

@ -23,11 +23,11 @@ alloy.recipeBuilder().inputs([<minecraft:diamond>,<ore:dustPulsating>]).outputs(
//Dusts
recipes.addShapeless(<minecraft:gravel>, [<minecraft:cobblestone>, <ore:gtceMortars>]);
recipes.addShapeless(<minecraft:sand>, [<minecraft:gravel>, <ore:gtceHardHammers>]);
recipes.addShapeless(<contenttweaker:block_dust>, [<minecraft:sand>, <ore:gtceHardHammers>]);
recipes.addShapeless(<minecraft:gravel>, [<minecraft:cobblestone>, <ore:toolMortar>]);
recipes.addShapeless(<minecraft:sand>, [<minecraft:gravel>, <ore:toolHammer>]);
recipes.addShapeless(<contenttweaker:block_dust>, [<minecraft:sand>, <ore:toolHammer>]);
furnace.addRecipe(<contenttweaker:pulsatingdust>, <metaitem:dustUraninite>, 0.0);
recipes.addShapeless(<minecraft:gravel>, [<minecraft:cobblestone>, <ore:gtceMortars>]);
recipes.addShapeless(<minecraft:gravel>, [<minecraft:cobblestone>, <ore:toolMortar>]);
//Snad
recipes.remove(<snad:snad>);

18
overrides/scripts/ProjectRed.zs
View File

@ -67,43 +67,45 @@ recipes.remove(<projectred-core:resource_item:311>);
furnace.remove(<projectred-core:resource_item:341>);
furnace.remove(<projectred-core:resource_item:320>);
var screwdriver = <ore:toolScrewdriver>;
recipes.addShaped(<projectred-core:resource_item:1>, [
[null, <ore:plateRedAlloy>, null],
[null, <projectred-core:resource_item>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-core:resource_item:4>, [
[null, <projectred-core:resource_item>, null],
[<projectred-core:resource_item:2>, <metaitem:frameWood>, <projectred-core:resource_item:2>],
[<projectred-core:resource_item>, <ore:gtceScrewdrivers>, <projectred-core:resource_item>]
[<projectred-core:resource_item>, screwdriver, <projectred-core:resource_item>]
]);
recipes.addShaped(<projectred-core:resource_item:10>, [
[null, <ore:plateRedstone>, null],
[null, <projectred-core:resource_item>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-core:resource_item:12>, [
[null, <ore:circuitUlv>, null],
[null, <projectred-core:resource_item:11>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-core:resource_item:11>, [
[null, <ore:boltRedAlloy>, null],
[null, <projectred-core:resource_item>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-core:resource_item:2>, [
[null, <ore:wireGtSingleRedAlloy>, null],
[null, <projectred-core:resource_item>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-core:resource_item:3>, [
[null, <ore:projredBundledCable>, null],
[null, <projectred-core:resource_item>, null],
[null, <ore:gtceScrewdrivers>, null]
[null, screwdriver, null]
]);
recipes.addShaped(<projectred-integration:gate:30>, [
[<projectred-core:resource_item:3>, <ore:gtceScrewdrivers>, <projectred-core:resource_item:3>],
[<projectred-core:resource_item:3>, screwdriver, <projectred-core:resource_item:3>],
[<projectred-core:resource_item:3>, <metaitem:cover.screen>, <projectred-core:resource_item:3>],
[<projectred-core:resource_item:3>, <ore:circuitLv>, <projectred-core:resource_item:3>],
]);

8
overrides/scripts/coins.zs
View File

@ -17,13 +17,13 @@ recipes.addShaped(<contenttweaker:stonewidget>, [
[null, <enderio:item_material:10>, null],
[null, <contenttweaker:stonewidgetdown>, null]]);
recipes.addShaped(<contenttweaker:stonewidgetup>, [
[<minecraft:stone_slab>, <ore:gtceHardHammers>, <minecraft:stone_slab>],
[<minecraft:stone_slab>, <ore:toolHammer>, <minecraft:stone_slab>],
[<minecraft:stone>,<minecraft:stone>,<minecraft:stone>],
[<minecraft:stone>,<minecraft:stone>,<minecraft:stone>]]);
recipes.addShaped(<contenttweaker:stonewidgetdown>, [
[<minecraft:stone>,<minecraft:stone>,<minecraft:stone>],
[<minecraft:stone>,<minecraft:stone>,<minecraft:stone>],
[<minecraft:stone_slab>, <ore:gtceHardHammers>, <minecraft:stone_slab>]]);
[<minecraft:stone_slab>, <ore:toolHammer>, <minecraft:stone_slab>]]);
recipes.remove(<enderio:item_material:10>);
recipes.addShaped(<enderio:item_material:10>,[
[null, <minecraft:stone>, null],
@ -39,11 +39,11 @@ recipes.addShaped(<contenttweaker:woodenwidget>, [
[null,null,null]]);
recipes.addShaped(<contenttweaker:woodwidgetleft>, [
[<ore:slabWood>,<ore:plankWood>,<ore:plankWood>],
[<ore:gtceSaws>,<ore:plankWood>,<ore:plankWood>],
[<ore:toolSaw>,<ore:plankWood>,<ore:plankWood>],
[<ore:slabWood>, <ore:plankWood>, <ore:plankWood>]]);
recipes.addShaped(<contenttweaker:woodwidgetright>, [
[<ore:plankWood>,<ore:plankWood>,<ore:slabWood>],
[<ore:plankWood>,<ore:plankWood>,<ore:gtceSaws>],
[<ore:plankWood>,<ore:plankWood>,<ore:toolSaw>],
[<ore:plankWood>,<ore:plankWood>,<ore:slabWood>]]);
recipes.remove(<enderio:item_material:9>);

8
overrides/scripts/electronics.zs
View File

@ -127,7 +127,7 @@ mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:8>);
mods.jei.JEI.removeAndHide(<enderio:item_endergy_conduit:9>);
val wrench = <ore:gtceWrenches>;
val wrench = <ore:toolWrench>;
// Microversium Machine Casing
makeShaped("of_microverse_casing", <contenttweaker:microverse_casing> * 2,
@ -158,7 +158,7 @@ assembler.recipeBuilder()
// [<ore:cableGtSingleTin>, <gregtech:machine_casing:1>, <ore:cableGtSingleTin>]]);
//Wood Pulp
recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:gtceMortars>]);
recipes.addShapeless(<metaitem:dustWood> * 4,[<ore:logWood>,<ore:toolMortar>]);
//Pyrolyse Oven
recipes.removeByRecipeName("gregtech:pyrolyse_oven");
@ -176,7 +176,7 @@ recipes.addShaped(<meta_tile_entity:pyrolyse_oven>, [
//recipes.removeByRecipeName("gregtech:casing.lv");
//recipes.addShaped(<gregtech:machine_casing:1>, [
// [<ore:plateWroughtIron>, <ore:plateWroughtIron>, <ore:plateWroughtIron>],
// [<ore:plateWroughtIron>, <ore:craftingToolWrench>, <ore:plateWroughtIron>],
// [<ore:plateWroughtIron>, <ore:toolWrench>, <ore:plateWroughtIron>],
// [<ore:plateWroughtIron>, <ore:plateWroughtIron>, <ore:plateWroughtIron>]
//]);
//// LV Machine Casing * 1
@ -188,7 +188,7 @@ recipes.addShaped(<meta_tile_entity:pyrolyse_oven>, [
//
//recipes.addShaped(<gregtech:machine_casing>, [
// [<metaitem:plateIron>, <metaitem:plateIron>, <metaitem:plateIron>],
// [<metaitem:plateIron>, <ore:craftingToolWrench>, <metaitem:plateIron>],
// [<metaitem:plateIron>, <ore:toolWrench>, <metaitem:plateIron>],
// [<metaitem:plateIron>, <metaitem:plateIron>, <metaitem:plateIron>]
//]);
//// ULV Machine Casing * 1

3
overrides/scripts/gregtech_recipemaps.zs
View File

@ -69,6 +69,8 @@ global wiremill as RecipeMap = RecipeMap.getByName("wiremill
// Tools
/* Depreciating, replacing with native CEu Oredicts.
<ore:gtceWrenches>.addItems([
<gregtech:wrench>.withEmptyTag(),
<gregtech:wrench_lv>.withEmptyTag(),
@ -97,3 +99,4 @@ global wiremill as RecipeMap = RecipeMap.getByName("wiremill
<ore:gtceMortars>.addItems([
<gregtech:mortar>.withEmptyTag()]);
*/

2
overrides/scripts/normalmode.zs
View File

@ -299,7 +299,7 @@ makeShaped("of_nc_water_source", <nuclearcraft:water_source>,
//Rubber by hand
recipes.addShaped(<metaitem:plateRubber>,[[<ore:gtceHardHammers>],[<metaitem:rubber_drop>],[<metaitem:rubber_drop>]]);
recipes.addShaped(<metaitem:plateRubber>,[[<ore:toolHammer>],[<metaitem:rubber_drop>],[<metaitem:rubber_drop>]]);
//Rubber Sheet
compressor.recipeBuilder().inputs(<metaitem:rubber_drop>).outputs(<metaitem:plateRubber>).duration(20).EUt(8).buildAndRegister();