Skip to content

Commit

Permalink
New Setting, "Black List Ticking Blocks"
Browse files Browse the repository at this point in the history
  • Loading branch information
AlgorithmX2 committed Apr 5, 2017
1 parent b5f65a2 commit 9e4ba30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
Expand Up @@ -209,7 +209,8 @@ public static boolean supportsBlock(

final BlockBitInfo info = BlockBitInfo.createFromState( state );

boolean hasBehavior = ( blk.hasTileEntity( state ) || blk.getTickRandomly() ) && blkClass != BlockGrass.class && blkClass != BlockIce.class;
final boolean tickingBehavior = blk.getTickRandomly() && ChiselsAndBits.getConfig().blacklistTickingBlocks;
boolean hasBehavior = ( blk.hasTileEntity( state ) || tickingBehavior ) && blkClass != BlockGrass.class && blkClass != BlockIce.class;
final boolean hasItem = Item.getItemFromBlock( blk ) != null;

final boolean supportedMaterial = ChiselsAndBits.getBlocks().getConversion( state ) != null;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/mod/chiselsandbits/config/ModConfig.java
Expand Up @@ -174,6 +174,9 @@ public class ModConfig extends Configuration
@Configured( category = "Client Performance Settings" )
public boolean defaultToDynamicRenderer;

@Configured( category = "Balance Settings" )
public boolean blacklistTickingBlocks;

@Configured( category = "Balance Settings" )
public boolean damageTools;

Expand Down Expand Up @@ -350,6 +353,7 @@ private void setDefaults()
enableSetBitCommand = false;

damageTools = true;
blacklistTickingBlocks = true;
stoneChiselUses = 8384;
ironChiselUses = 293440;
diamondChiselUses = 796480;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/chiselsandbits/lang/en_US.lang
Expand Up @@ -241,5 +241,6 @@ mod.chiselsandbits.config.useVBO=Use VBOs
mod.chiselsandbits.config.defaultToDynamicRenderer.tooltip=By default C&B uses the static renderer, and changes to the Dynamic Renderer on update, This setting reverse that; After determining the detail of the model it will decide to revert to the static renderer, helpful for more complicated scenes that cause stalls when using the static renderer.
mod.chiselsandbits.config.forceDynamicRenderer.tooltip=Debug Setting, that disable the static render entirely.
mod.chiselsandbits.config.useVBO.tooltip=By Default uses the same setting as MC, but can be overridden.
mod.chiselsandbits.config.blacklistTickingBlocks=Black List Ticking Blocks
mod.chiselsandbits.config.radialMenuVolume='Click' volume for radial menu.
mod.chiselsandbits.config.radialMenuVolume.tooltip=Setting to Zero will disable it.

0 comments on commit 9e4ba30

Please sign in to comment.