From 046ab3f1e864fd024b2d9cea16b8a6dbd3412537 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 6 May 2014 20:53:01 -0500 Subject: [PATCH 1/4] Recipe files no longer require a blank line at the end. --- recipes/RecipeHandler.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/RecipeHandler.java b/recipes/RecipeHandler.java index f775bab5..8524e90e 100644 --- a/recipes/RecipeHandler.java +++ b/recipes/RecipeHandler.java @@ -361,6 +361,10 @@ public class RecipeHandler implements IRecipeHandler } } + + if ( token.length() > 0 ) + tokens.add( token ); + reader.close(); processTokens( loader, path, line ); } From 4abe3e8807792208a382c0ce0f839f61ac578b3f Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 7 May 2014 12:49:32 -0500 Subject: [PATCH 2/4] Fix Crash when adding trades when items are disabled. --- hooks/AETrading.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hooks/AETrading.java b/hooks/AETrading.java index 2f3da4c8..a07a6ef3 100644 --- a/hooks/AETrading.java +++ b/hooks/AETrading.java @@ -42,6 +42,9 @@ public class AETrading implements IVillageTradeHandler private void addMerchent(MerchantRecipeList list, ItemStack item, int emera, Random rand, int greed) { + if ( item == null ) + return; + // Sell ItemStack From = item.copy(); ItemStack To = new ItemStack( Items.emerald ); From dd74fce634b661bd8c892b8ec644866d7783a8c3 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 7 May 2014 17:21:48 -0500 Subject: [PATCH 3/4] Added some assertions about null icons. --- client/texture/FlipableIcon.java | 4 ++++ client/texture/FullIcon.java | 4 ++++ client/texture/OffsetIcon.java | 4 ++++ client/texture/TaughtIcon.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/client/texture/FlipableIcon.java b/client/texture/FlipableIcon.java index bc233198..e30cc8fe 100644 --- a/client/texture/FlipableIcon.java +++ b/client/texture/FlipableIcon.java @@ -10,6 +10,10 @@ public class FlipableIcon implements IIcon boolean flip_v; public FlipableIcon(IIcon o) { + + if ( o == null ) + throw new RuntimeException("Cannot create a wrapper icon with a null icon."); + original = o; flip_u = false; flip_v = false; diff --git a/client/texture/FullIcon.java b/client/texture/FullIcon.java index 59f0d1ca..397adc85 100644 --- a/client/texture/FullIcon.java +++ b/client/texture/FullIcon.java @@ -10,6 +10,10 @@ public class FullIcon implements IIcon private IIcon p; public FullIcon(IIcon o) { + + if ( o == null ) + throw new RuntimeException("Cannot create a wrapper icon with a null icon."); + p = o; } diff --git a/client/texture/OffsetIcon.java b/client/texture/OffsetIcon.java index f8c676a0..ddd17d44 100644 --- a/client/texture/OffsetIcon.java +++ b/client/texture/OffsetIcon.java @@ -13,6 +13,10 @@ public class OffsetIcon implements IIcon private IIcon p; public OffsetIcon(IIcon o, float x, float y) { + + if ( o == null ) + throw new RuntimeException("Cannot create a wrapper icon with a null icon."); + p = o; offsetX = x; offsetY = y; diff --git a/client/texture/TaughtIcon.java b/client/texture/TaughtIcon.java index 1c21acfb..64ee1c58 100644 --- a/client/texture/TaughtIcon.java +++ b/client/texture/TaughtIcon.java @@ -12,6 +12,10 @@ public class TaughtIcon implements IIcon private IIcon p; public TaughtIcon(IIcon o, float tightness) { + + if ( o == null ) + throw new RuntimeException("Cannot create a wrapper icon with a null icon."); + p = o; this.tightness = tightness * 0.4f; } From 03389020218e34ef0f548755ac74ae02ff1297b2 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 7 May 2014 20:54:28 -0500 Subject: [PATCH 4/4] No more null icons! --- client/texture/FlipableIcon.java | 6 +++--- client/texture/TmpFlipableIcon.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/client/texture/FlipableIcon.java b/client/texture/FlipableIcon.java index e30cc8fe..c4e3c103 100644 --- a/client/texture/FlipableIcon.java +++ b/client/texture/FlipableIcon.java @@ -10,10 +10,10 @@ public class FlipableIcon implements IIcon boolean flip_v; public FlipableIcon(IIcon o) { - + if ( o == null ) - throw new RuntimeException("Cannot create a wrapper icon with a null icon."); - + throw new RuntimeException( "Cannot create a wrapper icon with a null icon." ); + original = o; flip_u = false; flip_v = false; diff --git a/client/texture/TmpFlipableIcon.java b/client/texture/TmpFlipableIcon.java index 725fac1d..288094c4 100644 --- a/client/texture/TmpFlipableIcon.java +++ b/client/texture/TmpFlipableIcon.java @@ -1,12 +1,15 @@ package appeng.client.texture; +import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; public class TmpFlipableIcon extends FlipableIcon { + private static final IIcon nullIcon = new MissingIcon( Blocks.diamond_block ); + public TmpFlipableIcon() { - super( null ); + super( nullIcon ); } public void setOriginal(IIcon i) @@ -14,7 +17,10 @@ public class TmpFlipableIcon extends FlipableIcon while (i instanceof FlipableIcon) i = ((FlipableIcon) i).getOriginal(); - original = i; + if ( i == null ) + original = nullIcon; + else + original = i; } }