Skip to content

Commit

Permalink
Fix Ancient Blocks being Invalid Stabilisers (#42)
Browse files Browse the repository at this point in the history
* Reassign TBSidedBlock extend to TBBlockDeco

TBBLock & TBBLockDeco are identical. All instances of TBBLock & TBSidedBlock are valid stabilisers

* Remove redundant TBBlock class

* Implement IInfusionStabiliser in TBSidedBlock

Adds the proper tooltip to blocks which are valid stabilisers
  • Loading branch information
54M44R authored Nov 5, 2024
1 parent 836730f commit 0caf835
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 63 deletions.
53 changes: 0 additions & 53 deletions src/main/java/tb/common/block/TBBlock.java

This file was deleted.

3 changes: 2 additions & 1 deletion src/main/java/tb/common/block/TBSidedBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import thaumcraft.api.crafting.IInfusionStabiliser;

public class TBSidedBlock extends TBBlock {
public class TBSidedBlock extends TBBlockDeco implements IInfusionStabiliser {

public IIcon sideIcon;

Expand Down
13 changes: 4 additions & 9 deletions src/main/java/tb/init/TBBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import tb.common.block.BlockThaumicAnvil;
import tb.common.block.BlockVoid;
import tb.common.block.BlockVoidAnvil;
import tb.common.block.TBBlock;
import tb.common.block.TBBlockDeco;
import tb.common.block.TBSidedBlock;
import tb.common.itemblock.ItemBlockCrystal;
Expand All @@ -61,25 +60,21 @@ public class TBBlocks {

public static final Class<TBCore> core = TBCore.class;

public static Block quicksilverBlock = new TBBlock(Material.iron, false).stabilise()
.setBlockName("quicksilverBlock")
public static Block quicksilverBlock = new TBBlockDeco(Material.iron, false).setBlockName("quicksilverBlock")
.setBlockTextureName("thaumicbases:quicksilverBlock")
.setHardness(1F);
public static Block quicksilverBrick = new TBBlock(Material.rock, true).stabilise()
.setBlockName("quicksilverBrick")
public static Block quicksilverBrick = new TBBlockDeco(Material.rock, true).setBlockName("quicksilverBrick")
.setBlockTextureName("thaumicbases:quicksilverBrick")
.setHardness(1F);
public static Block crystalBlock = new BlockCrystalBlock().setBlockName("crystalBlock")
.setBlockTextureName("thaumicbases:crystal/mixed");
public static Block dustBlock = new TBBlock(Material.sand, false).stabilise()
.setStepSound(Block.soundTypeSand)
public static Block dustBlock = new TBBlockDeco(Material.sand, false).setStepSound(Block.soundTypeSand)
.setBlockName("salisMundusBlock")
.setBlockTextureName("thaumicbases:dust_block")
.setHardness(1F);
public static Block pyrofluid = new BlockPyrofluid().setBlockName("pyrofluid")
.setLightLevel(1);
public static Block thauminiteBlock = new TBBlock(Material.iron, false).stabilise()
.setBlockName("thauminiteBlock")
public static Block thauminiteBlock = new TBBlockDeco(Material.iron, false).setBlockName("thauminiteBlock")
.setBlockTextureName("thaumicbases:thauminiteblock")
.setHardness(2F);
public static Block eldritchArk = new TBBlockDeco(Material.rock, false).setBlockName("eldritchArk")
Expand Down

0 comments on commit 0caf835

Please sign in to comment.