Disable MCMP and add a setting to enable it optionally. ( Related #310 )

ChiselsAndBits · Nov 24, 2017 · 4f06e5a · 4f06e5a
1 parent dacf302
commit 4f06e5a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/main/java/mod/chiselsandbits/config/ModConfig.java b/src/main/java/mod/chiselsandbits/config/ModConfig.java
@@ -35,10 +35,13 @@ public class ModConfig extends Configuration
 	// mod settings...
 	@Configured( category = "Integration Settings" )
 	public boolean ShowBitsInJEI;
-	
+
 	@Configured( category = "Integration Settings" )
 	public boolean enableVivecraftCompatibility;
 
+	@Configured( category = "Integration Settings" )
+	public boolean enableMCMultipart;
+
 	@Configured( category = "Troubleshooting" )
 	public boolean enableAPITestingItem;
 
@@ -403,6 +406,7 @@ private void setDefaults()
 		enableBitSaw = true;
 		ShowBitsInJEI = false;
 		enableVivecraftCompatibility = false;
+		enableMCMultipart = false;
 	}
 
 	public ModConfig(

diff --git a/src/main/java/mod/chiselsandbits/integration/mcmultipart/MCMultipart2Addon.java b/src/main/java/mod/chiselsandbits/integration/mcmultipart/MCMultipart2Addon.java
@@ -16,28 +16,42 @@ public class MCMultipart2Addon implements IMCMPAddon
 
 	private static String TE_CHISELEDPART = ChiselsAndBits.MODID + ":mod.chiselsandbits.TileEntityChiseled";
 
+	private boolean isEnabled()
+	{
+		return ChiselsAndBits.getConfig().enableMCMultipart;
+	}
+
 	public MCMultipart2Addon()
 	{
-		ChiselsAndBits.registerWithBus( this );
+		if ( isEnabled() )
+		{
+			ChiselsAndBits.registerWithBus( this );
+		}
 	}
 
 	@SubscribeEvent
 	public void registerSlot(
 			RegistryEvent.Register<IPartSlot> e )
 	{
-		e.getRegistry().register( MultiPartSlots.BITS );
+		if ( isEnabled() )
+		{
+			e.getRegistry().register( MultiPartSlots.BITS );
+		}
 	}
 
 	@Override
 	public void registerParts(
 			IMultipartRegistry registry )
 	{
-		GameRegistry.registerTileEntity( ChiseledBlockPart.class, TE_CHISELEDPART );
-
-		MCMultipartProxy.proxyMCMultiPart.relay = new MCMultipart2Proxy();
-		for ( BlockChiseled blk : ChiselsAndBits.getBlocks().getConversions().values() )
+		if ( isEnabled() )
 		{
-			registry.registerPartWrapper( blk, new ChiseledBlockMultiPart( blk ) );
+			GameRegistry.registerTileEntity( ChiseledBlockPart.class, TE_CHISELEDPART );
+
+			MCMultipartProxy.proxyMCMultiPart.relay = new MCMultipart2Proxy();
+			for ( BlockChiseled blk : ChiselsAndBits.getBlocks().getConversions().values() )
+			{
+				registry.registerPartWrapper( blk, new ChiseledBlockMultiPart( blk ) );
+			}
 		}
 	}