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

Fix JEI integration with turtle/pocket upgrades

Browse Source 
- Remove incorrect impostor recipes for pocket computers. We were
   generating them from the list of turtle upgrades instead!
 - Fix JEI plugin not blocking impostor recipes as of the data-generator
   rewrite.
This commit is contained in:
Jonathan Coates
2020-12-23 15:46:27 +00:00
parent abf425dfb5
commit e3a672099c
26 changed files with 7 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/crafting_table.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/crafting_table"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:crafting_table"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/crafting_table"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_axe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/diamond_axe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:diamond_axe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/diamond_axe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_hoe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/diamond_hoe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:diamond_hoe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/diamond_hoe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_pickaxe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/diamond_pickaxe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:diamond_pickaxe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/diamond_pickaxe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_shovel.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/diamond_shovel"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:diamond_shovel"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/diamond_shovel"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_advanced/minecraft/diamond_sword.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_advanced/minecraft/diamond_sword"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_advanced"
},
{
"item": "minecraft:diamond_sword"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_advanced/minecraft/diamond_sword"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/crafting_table.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/crafting_table"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:crafting_table"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/crafting_table"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_axe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/diamond_axe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:diamond_axe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/diamond_axe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_hoe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/diamond_hoe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:diamond_hoe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/diamond_hoe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_pickaxe.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/diamond_pickaxe"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:diamond_pickaxe"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/diamond_pickaxe"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_shovel.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/diamond_shovel"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:diamond_shovel"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/diamond_shovel"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

35
src/generated/resources/data/computercraft/advancements/recipes/computercraft/pocket_normal/minecraft/diamond_sword.json generated
View File

@@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"computercraft:pocket_normal/minecraft/diamond_sword"
]
},
"criteria": {
"has_items": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "computercraft:pocket_computer_normal"
},
{
"item": "minecraft:diamond_sword"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "computercraft:pocket_normal/minecraft/diamond_sword"
}
}
},
"requirements": [
[
"has_items",
"has_the_recipe"
]
]
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/crafting_table.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:crafting_table"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_axe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:diamond_axe"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_hoe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:diamond_hoe"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_pickaxe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:diamond_pickaxe"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_shovel.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:diamond_shovel"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_advanced/minecraft/diamond_sword.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_advanced",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"item": "minecraft:diamond_sword"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/crafting_table.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:crafting_table"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_axe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:diamond_axe"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_hoe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:diamond_hoe"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_pickaxe.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:diamond_pickaxe"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_shovel.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:diamond_shovel"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

19
src/generated/resources/data/computercraft/recipes/pocket_normal/minecraft/diamond_sword.json generated
View File

@@ -1,19 +0,0 @@
{
"type": "computercraft:impostor_shaped",
"group": "computercraft:pocket_normal",
"pattern": [
"#",
"P"
],
"key": {
"#": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"item": "minecraft:diamond_sword"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
}
}

3
src/main/java/dan200/computercraft/data/Recipes.java
View File

@@ -8,6 +8,7 @@ package dan200.computercraft.data;
import dan200.computercraft.ComputerCraft; import dan200.computercraft.ComputerCraft;
import dan200.computercraft.data.Tags.CCTags; import dan200.computercraft.data.Tags.CCTags;
import dan200.computercraft.shared.PocketUpgrades;
import dan200.computercraft.shared.Registry; import dan200.computercraft.shared.Registry;
import dan200.computercraft.shared.TurtleUpgrades; import dan200.computercraft.shared.TurtleUpgrades;
import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -117,7 +118,7 @@ public class Recipes extends RecipeProvider
String nameId = family.name().toLowerCase( Locale.ROOT ); String nameId = family.name().toLowerCase( Locale.ROOT );
TurtleUpgrades.getVanillaUpgrades().forEach( upgrade -> { PocketUpgrades.getVanillaUpgrades().forEach( upgrade -> {
ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null ); ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null );
ShapedRecipeBuilder ShapedRecipeBuilder
.shapedRecipe( result.getItem() ) .shapedRecipe( result.getItem() )

7
src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java
View File

@@ -97,8 +97,11 @@ public class JEIComputerCraft implements IModPlugin
{ {
if( !(wrapper instanceof IRecipe) ) continue; if( !(wrapper instanceof IRecipe) ) continue;
ResourceLocation id = ((IRecipe) wrapper).getId(); ResourceLocation id = ((IRecipe) wrapper).getId();
if( id.getNamespace().equals( ComputerCraft.MOD_ID ) if( !id.getNamespace().equals( ComputerCraft.MOD_ID ) ) continue;
&& (id.getPath().startsWith( "generated/turtle_" ) || id.getPath().startsWith( "generated/pocket_" )) )
String path = id.getPath();
if( path.startsWith( "turtle_normal/" ) || path.startsWith( "turtle_advanced/" )
|| path.startsWith( "pocket_normal/" ) || path.startsWith( "pocket_advanced/" ) )
{ {
registry.hideRecipe( wrapper, VanillaRecipeCategoryUid.CRAFTING ); registry.hideRecipe( wrapper, VanillaRecipeCategoryUid.CRAFTING );
} }