From 2f2a18052ae3261ce24dcb1c6811f68d39fd54df Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Mon, 24 Feb 2014 14:45:19 +1000 Subject: [PATCH] Reduce micro material clash to warning --- codechicken/microblock/MicroMaterialRegistry.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/codechicken/microblock/MicroMaterialRegistry.scala b/codechicken/microblock/MicroMaterialRegistry.scala index 48580b2..31e099a 100644 --- a/codechicken/microblock/MicroMaterialRegistry.scala +++ b/codechicken/microblock/MicroMaterialRegistry.scala @@ -126,9 +126,11 @@ object MicroMaterialRegistry if(MultiPartRegistry.loaded) throw new IllegalStateException("You must register your materials in the init methods.") - if(typeMap.contains(name)) - throw new IllegalStateException("Material with id "+name+" is already registered.") - + if(typeMap.contains(name)) { + System.err.println("Material with id "+name+" is already registered.") + return + } + System.out.println("Registered micro material: "+name) typeMap.put(name, material)