mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-31 13:42:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mc-1.16.x' into mc-1.18.x

Browse Source
This commit is contained in:
Jonathan Coates
2023-02-14 10:10:50 +00:00
parent 0db32bd0fe d7305fb975
commit 1f3b781a1d
107 changed files with 5580 additions and 974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/data/RecipeGenerator.java
View File

@@ -209,7 +209,7 @@ class RecipeGenerator extends RecipeProvider
.pattern( "#C#" )
.pattern( "# #" )
.define( '#', Tags.Items.INGOTS_GOLD )
.define( 'C', Registry.ModItems.COMPUTER_ADVANCED.get() )
.define( 'C', Registry.ModItems.COMPUTER_NORMAL.get() )
.unlockedBy( "has_components", inventoryChange( itemPredicate( Registry.ModItems.COMPUTER_NORMAL.get() ), itemPredicate( Tags.Items.INGOTS_GOLD ) ) )
.save(
RecipeWrapper.wrap( ComputerUpgradeRecipe.SERIALIZER, add ).withExtraData( family( ComputerFamily.ADVANCED ) ),
@@ -255,7 +255,7 @@ class RecipeGenerator extends RecipeProvider
.pattern( "#C#" )
.pattern( " B " )
.define( '#', Tags.Items.INGOTS_GOLD )
.define( 'C', Registry.ModItems.COMPUTER_ADVANCED.get() )
.define( 'C', Registry.ModItems.TURTLE_NORMAL.get() )
.define( 'B', Tags.Items.STORAGE_BLOCKS_GOLD )
.unlockedBy( "has_components", inventoryChange( itemPredicate( Registry.ModItems.TURTLE_NORMAL.get() ), itemPredicate( Tags.Items.INGOTS_GOLD ) ) )
.save(