From 04e4fd10a578ce60cb2652462ca2c4c7c0a03d2e Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Wed, 5 Oct 2016 00:51:18 +0200 Subject: [PATCH] Fixes lumen paintball recipes. Fixes flux stairs. Fixes anything that requires a wrench (network tool) or cutting knife (cable anchors). --- src/main/java/appeng/recipes/AEItemResolver.java | 2 +- .../appliedenergistics2/recipes/decorative/stairs.recipe | 6 +++--- .../assets/appliedenergistics2/recipes/groups.recipe | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/appeng/recipes/AEItemResolver.java b/src/main/java/appeng/recipes/AEItemResolver.java index 05f23971..ef389fab 100644 --- a/src/main/java/appeng/recipes/AEItemResolver.java +++ b/src/main/java/appeng/recipes/AEItemResolver.java @@ -58,7 +58,7 @@ public class AEItemResolver implements ISubItemResolver if( itemName.startsWith( "lumen_paint_ball." ) ) { - return this.paintBall( items.coloredLumenPaintBall(), itemName.substring( itemName.indexOf( '.' ) + 1 ), true ); + return this.paintBall( items.coloredPaintBall(), itemName.substring( itemName.indexOf( '.' ) + 1 ), true ); } if( itemName.equals( "cable_glass" ) ) diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe index 02b8fe48..935ed7a3 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/stairs.recipe @@ -5,9 +5,9 @@ shaped= -> 4 ae2:chiseled_quartz_stairs shaped= - ae2:fluix _ _, - ae2:fluix ae2:fluix _, - ae2:fluix ae2:fluix ae2:fluix + ae2:fluix_block _ _, + ae2:fluix_block ae2:fluix_block _, + ae2:fluix_block ae2:fluix_block ae2:fluix_block -> 4 ae2:fluix_stairs shaped= diff --git a/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe index bff12741..883a1101 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/groups.recipe @@ -1,8 +1,8 @@ group= oredictionary:itemIlluminatedPanel -> monitor group= ae2:interface ae2:part.Interface -> interface -group= ae2:ToolCertusQuartzCuttingKnife:* ae2:ToolNetherQuartzCuttingKnife:* -> knife -group= ae2:ToolCertusQuartzWrench ae2:ToolNetherQuartzWrench -> wrench +group= ae2:certus_quartz_cutting_knife:* ae2:nether_quartz_cutting_knife:* -> knife +group= ae2:certus_quartz_wrench ae2:nether_quartz_wrench -> wrench group= ae2:cable_glass ae2:cable_covered ae2:cable_smart -> cable group= ae2:cable_dense -> densecable