From 2c9f51db89ce5f0bbd1470c2ae2b0cbb94738251 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Wed, 6 Jan 2021 18:08:19 +0000 Subject: [PATCH] Don't fatally error if CraftTweaker items have NBT CT now adds {Damage:0}, which means turtle upgrades not registered any more for tools. Fixes #647. --- .../shared/integration/crafttweaker/TrackingLogger.java | 1 - .../shared/integration/crafttweaker/actions/AddTurtleTool.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/TrackingLogger.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/TrackingLogger.java index 329a96b0e..da1708c00 100644 --- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/TrackingLogger.java +++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/TrackingLogger.java @@ -27,7 +27,6 @@ public boolean isOk() public void warning( String message ) { - ok = false; logger.warning( message ); } diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java index f9f0a6907..38acb1561 100644 --- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java +++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java @@ -103,7 +103,7 @@ public boolean validate( ILogger logger ) { TrackingLogger trackLog = new TrackingLogger( logger ); - if( craftItem.isEmpty() ) trackLog.warning( "Crafting item stack is empty." ); + if( craftItem.isEmpty() ) trackLog.error( "Crafting item stack is empty." ); if( craftItem.hasTag() && !craftItem.getTag().isEmpty() ) trackLog.warning( "Crafting item has NBT." ); if( toolItem.isEmpty() ) trackLog.error( "Tool item stack is empty." );