MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Change] Using BCLibs Behaviours

Browse source
This commit is contained in:
Frank 2023-05-24 17:06:28 +02:00
parent f39fd67d62
commit a37dfb8a26
4 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/betterx/betterend/complexmaterials/CrystalSubblocksMaterial.java
View file

@ -36,14 +36,14 @@ public class CrystalSubblocksMaterial {
polished = EndBlocks.registerBlock(name + "_polished", new LitBaseBlock(material)); polished = EndBlocks.registerBlock(name + "_polished", new LitBaseBlock(material));
tiles = EndBlocks.registerBlock(name + "_tiles", new LitBaseBlock(material)); tiles = EndBlocks.registerBlock(name + "_tiles", new LitBaseBlock(material));
pillar = EndBlocks.registerBlock(name + "_pillar", new LitPillarBlock(material)); pillar = EndBlocks.registerBlock(name + "_pillar", new LitPillarBlock(material));
stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(source)); stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(source));
slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(source)); slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(source));
wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock(source)); wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock.Stone(source));
pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(source)); pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(source));
bricks = EndBlocks.registerBlock(name + "_bricks", new LitBaseBlock(material)); bricks = EndBlocks.registerBlock(name + "_bricks", new LitBaseBlock(material));
brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock(bricks)); brick_stairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks));
brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock(bricks)); brick_slab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks));
brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks)); brick_wall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock.Stone(bricks));
// Recipes // // Recipes //
BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks) BCLRecipeBuilder.crafting(BetterEnd.makeID(name + "_bricks"), bricks)

14
src/main/java/org/betterx/betterend/complexmaterials/MetalMaterial.java
View file

@ -182,17 +182,17 @@ public class MetalMaterial {
TagManager.ITEMS.add(alloyingOre, ore.asItem(), rawOre); TagManager.ITEMS.add(alloyingOre, ore.asItem(), rawOre);
} }
block = EndBlocks.registerBlock(name + "_block", new BaseBlock(settings)); block = EndBlocks.registerBlock(name + "_block", new BaseBlock.Metal(settings));
tile = EndBlocks.registerBlock(name + "_tile", new BaseBlock(settings)); tile = EndBlocks.registerBlock(name + "_tile", new BaseBlock.Metal(settings));
stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(tile)); stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Metal(tile));
slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(tile)); slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Metal(tile));
door = EndBlocks.registerBlock(name + "_door", new BaseDoorBlock(block, BlockSetType.IRON)); door = EndBlocks.registerBlock(name + "_door", new BaseDoorBlock.Metal(block, BlockSetType.IRON));
trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BaseTrapdoorBlock(block, BlockSetType.IRON)); trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new BaseTrapdoorBlock.Metal(block, BlockSetType.IRON));
bars = EndBlocks.registerBlock(name + "_bars", new BaseMetalBarsBlock(block)); bars = EndBlocks.registerBlock(name + "_bars", new BaseMetalBarsBlock(block));
chain = EndBlocks.registerBlock(name + "_chain", new BaseChainBlock(block.defaultMaterialColor())); chain = EndBlocks.registerBlock(name + "_chain", new BaseChainBlock(block.defaultMaterialColor()));
pressurePlate = EndBlocks.registerBlock( pressurePlate = EndBlocks.registerBlock(
name + "_plate", name + "_plate",
new WoodenPressurePlateBlock(block, BlockSetType.IRON) new BasePressurePlateBlock.Wood(block, BlockSetType.IRON)
); );
chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(block)); chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(block));

18
src/main/java/org/betterx/betterend/complexmaterials/StoneMaterial.java
View file

@ -55,22 +55,22 @@ public class StoneMaterial {
stone = EndBlocks.registerBlock(name, new BaseBlock(material)); stone = EndBlocks.registerBlock(name, new BaseBlock(material));
polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material)); polished = EndBlocks.registerBlock(name + "_polished", new BaseBlock(material));
tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material)); tiles = EndBlocks.registerBlock(name + "_tiles", new BaseBlock(material));
pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock(material)); pillar = EndBlocks.registerBlock(name + "_pillar", new BaseRotatedPillarBlock.Stone(material));
stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock(stone)); stairs = EndBlocks.registerBlock(name + "_stairs", new BaseStairsBlock.Stone(stone));
slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock(stone)); slab = EndBlocks.registerBlock(name + "_slab", new BaseSlabBlock.Stone(stone));
wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock(stone)); wall = EndBlocks.registerBlock(name + "_wall", new BaseWallBlock.Stone(stone));
button = EndBlocks.registerBlock(name + "_button", new BaseStoneButtonBlock(stone, BlockSetType.STONE)); button = EndBlocks.registerBlock(name + "_button", new BaseButtonBlock.Stone(stone, BlockSetType.STONE));
pressurePlate = EndBlocks.registerBlock( pressurePlate = EndBlocks.registerBlock(
name + "_plate", name + "_plate",
new StonePressurePlateBlock(stone, BlockSetType.STONE) new BasePressurePlateBlock.Stone(stone, BlockSetType.STONE)
); );
pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone)); pedestal = EndBlocks.registerBlock(name + "_pedestal", new EndPedestal(stone));
lantern = EndBlocks.registerBlock(name + "_lantern", new StoneLanternBlock(stone)); lantern = EndBlocks.registerBlock(name + "_lantern", new StoneLanternBlock(stone));
bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material)); bricks = EndBlocks.registerBlock(name + "_bricks", new BaseBlock(material));
brickStairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock(bricks)); brickStairs = EndBlocks.registerBlock(name + "_bricks_stairs", new BaseStairsBlock.Stone(bricks));
brickSlab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock(bricks)); brickSlab = EndBlocks.registerBlock(name + "_bricks_slab", new BaseSlabBlock.Stone(bricks));
brickWall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock(bricks)); brickWall = EndBlocks.registerBlock(name + "_bricks_wall", new BaseWallBlock.Stone(bricks));
furnace = EndBlocks.registerBlock(name + "_furnace", new BaseFurnaceBlock(bricks)); furnace = EndBlocks.registerBlock(name + "_furnace", new BaseFurnaceBlock(bricks));
flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks)); flowerPot = EndBlocks.registerBlock(name + "_flower_pot", new FlowerPotBlock(bricks));

10
src/main/java/org/betterx/betterend/registry/EndBlocks.java
View file

@ -142,16 +142,16 @@ public class EndBlocks {
); );
public static final Block DRAGON_BONE_BLOCK = registerBlock( public static final Block DRAGON_BONE_BLOCK = registerBlock(
"dragon_bone_block", "dragon_bone_block",
new BaseRotatedPillarBlock(Blocks.BONE_BLOCK), new BaseRotatedPillarBlock.Wood(Blocks.BONE_BLOCK, false),
EndTags.BONEMEAL_TARGET_DRAGON_BONE EndTags.BONEMEAL_TARGET_DRAGON_BONE
); );
public static final Block DRAGON_BONE_STAIRS = registerBlock( public static final Block DRAGON_BONE_STAIRS = registerBlock(
"dragon_bone_stairs", "dragon_bone_stairs",
new BaseStairsBlock(DRAGON_BONE_BLOCK) new BaseStairsBlock.Wood(DRAGON_BONE_BLOCK)
); );
public static final Block DRAGON_BONE_SLAB = registerBlock( public static final Block DRAGON_BONE_SLAB = registerBlock(
"dragon_bone_slab", "dragon_bone_slab",
new BaseSlabBlock(DRAGON_BONE_BLOCK) new BaseSlabBlock.Wood(DRAGON_BONE_BLOCK)
); );
public static final Block MOSSY_DRAGON_BONE = registerBlock( public static final Block MOSSY_DRAGON_BONE = registerBlock(
"mossy_dragon_bone", "mossy_dragon_bone",
@ -505,11 +505,11 @@ public class EndBlocks {
public static final Block NEON_CACTUS_BLOCK = registerBlock("neon_cactus_block", new NeonCactusBlock()); public static final Block NEON_CACTUS_BLOCK = registerBlock("neon_cactus_block", new NeonCactusBlock());
public static final Block NEON_CACTUS_BLOCK_STAIRS = registerBlock( public static final Block NEON_CACTUS_BLOCK_STAIRS = registerBlock(
"neon_cactus_stairs", "neon_cactus_stairs",
new BaseStairsBlock(NEON_CACTUS_BLOCK) new BaseStairsBlock.Wood(NEON_CACTUS_BLOCK)
); );
public static final Block NEON_CACTUS_BLOCK_SLAB = registerBlock( public static final Block NEON_CACTUS_BLOCK_SLAB = registerBlock(
"neon_cactus_slab", "neon_cactus_slab",
new BaseSlabBlock(NEON_CACTUS_BLOCK) new BaseSlabBlock.Wood(NEON_CACTUS_BLOCK)
); );
// Crops // Crops