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

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

Browse Source
This commit is contained in:
Jonathan Coates
2023-02-14 10:19:46 +00:00
parent 7df0412c2d 1f3b781a1d
commit 41cd9c7544
107 changed files with 5565 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,7 +210,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 ) ),
@@ -256,7 +256,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(