Skip to content

Commit

Permalink
Twoo daysss, :pleading:
Browse files Browse the repository at this point in the history
  • Loading branch information
@SammySemicolon
SammySemicolon committed Apr 24, 2024
1 parent 41b6b7a commit b2c69a4
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 18 deletions.
7 changes: 0 additions & 7 deletions src/generated/resources/data/minecraft/tags/blocks/leaves.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
{
"values": [
"malum:azure_runewood_leaves",
"malum:azure_runewood_leaves",
"malum:hanging_soulwood_leaves",
"malum:hanging_azure_runewood_leaves",
"malum:hanging_azure_runewood_leaves",
"malum:soulwood_leaves",
"malum:hanging_runewood_leaves",
"malum:hanging_runewood_leaves",
"malum:budding_soulwood_leaves",
"malum:runewood_leaves",
"malum:runewood_leaves"
]
}
7 changes: 0 additions & 7 deletions src/generated/resources/data/minecraft/tags/items/leaves.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
{
"values": [
"malum:azure_runewood_leaves",
"malum:azure_runewood_leaves",
"malum:hanging_soulwood_leaves",
"malum:hanging_azure_runewood_leaves",
"malum:hanging_azure_runewood_leaves",
"malum:soulwood_leaves",
"malum:hanging_runewood_leaves",
"malum:hanging_runewood_leaves",
"malum:budding_soulwood_leaves",
"malum:runewood_leaves",
"malum:runewood_leaves"
]
}
6 changes: 3 additions & 3 deletions src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ public class BlockRegistry {
//region runewood
public static final RegistryObject<Block> RUNEWOOD_SAPLING = BLOCKS.register("runewood_sapling", () -> new MalumSaplingBlock(new RunewoodTreeGrower(), MalumBlockProperties.RUNEWOOD_SAPLING().setCutoutRenderType().randomTicks()));
public static final RegistryObject<Block> RUNEWOOD_LEAVES = BLOCKS.register("runewood_leaves", () -> new MalumLeavesBlock(MalumBlockProperties.RUNEWOOD_LEAVES().setCutoutRenderType(), MalumBlockProperties.RUNEWOOD_LEAVES_ORANGE, MalumBlockProperties.RUNEWOOD_LEAVES_YELLOW));
public static final RegistryObject<Block> HANGING_RUNEWOOD_LEAVES = BLOCKS.register("hanging_runewood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.RUNEWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), MalumBlockProperties.RUNEWOOD_LEAVES_ORANGE, MalumBlockProperties.RUNEWOOD_LEAVES_YELLOW));
public static final RegistryObject<Block> HANGING_RUNEWOOD_LEAVES = BLOCKS.register("hanging_runewood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.HANGING_RUNEWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), MalumBlockProperties.RUNEWOOD_LEAVES_ORANGE, MalumBlockProperties.RUNEWOOD_LEAVES_YELLOW));

public static final RegistryObject<Block> AZURE_RUNEWOOD_SAPLING = BLOCKS.register("azure_runewood_sapling", () -> new MalumSaplingBlock(new AzureRunewoodTreeGrower(), MalumBlockProperties.RUNEWOOD_SAPLING().setCutoutRenderType().randomTicks()));
public static final RegistryObject<Block> AZURE_RUNEWOOD_LEAVES = BLOCKS.register("azure_runewood_leaves", () -> new MalumLeavesBlock(MalumBlockProperties.RUNEWOOD_LEAVES().setCutoutRenderType(), MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_BLUE, MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_CYAN));
public static final RegistryObject<Block> HANGING_AZURE_RUNEWOOD_LEAVES = BLOCKS.register("hanging_azure_runewood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.RUNEWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_BLUE, MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_CYAN));
public static final RegistryObject<Block> HANGING_AZURE_RUNEWOOD_LEAVES = BLOCKS.register("hanging_azure_runewood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.HANGING_RUNEWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_BLUE, MalumBlockProperties.AZURE_RUNEWOOD_LEAVES_CYAN));


public static final RegistryObject<Block> STRIPPED_RUNEWOOD_LOG = BLOCKS.register("stripped_runewood_log", () -> new RotatedPillarBlock(MalumBlockProperties.RUNEWOOD().addTags(LOGS, STRIPPED_LOGS, RUNEWOOD_LOGS)));
Expand Down Expand Up @@ -270,7 +270,7 @@ public class BlockRegistry {
public static final RegistryObject<Block> SOULWOOD_GROWTH = BLOCKS.register("soulwood_growth", () -> new SoulwoodGrowthBlock(new SoulwoodTreeGrower(), MalumBlockProperties.BLIGHTED_PLANTS().setCutoutRenderType().randomTicks()));
public static final RegistryObject<Block> SOULWOOD_LEAVES = BLOCKS.register("soulwood_leaves", () -> new MalumLeavesBlock(MalumBlockProperties.SOULWOOD_LEAVES().setCutoutRenderType(), new Color(213, 8, 63), new Color(255, 61, 243)));
public static final RegistryObject<Block> BUDDING_SOULWOOD_LEAVES = BLOCKS.register("budding_soulwood_leaves", () -> new MalumLeavesBlock(MalumBlockProperties.SOULWOOD_LEAVES().setCutoutRenderType(), new Color(213, 8, 63), new Color(255, 61, 243)));
public static final RegistryObject<Block> HANGING_SOULWOOD_LEAVES = BLOCKS.register("hanging_soulwood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.SOULWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), new Color(213, 8, 63), new Color(255, 61, 243)));
public static final RegistryObject<Block> HANGING_SOULWOOD_LEAVES = BLOCKS.register("hanging_soulwood_leaves", () -> new MalumHangingLeavesBlock(MalumBlockProperties.HANGING_SOULWOOD_LEAVES().setCutoutRenderType().noOcclusion().noCollission(), new Color(213, 8, 63), new Color(255, 61, 243)));

public static final RegistryObject<Block> STRIPPED_SOULWOOD_LOG = BLOCKS.register("stripped_soulwood_log", () -> new RotatedPillarBlock(MalumBlockProperties.SOULWOOD().addTags(LOGS, STRIPPED_LOGS, SOULWOOD_LOGS)));
public static final RegistryObject<Block> SOULWOOD_LOG = BLOCKS.register("soulwood_log", () -> new SoulwoodLogBlock(MalumBlockProperties.SOULWOOD().addTags(LOGS, SOULWOOD_LOGS), STRIPPED_SOULWOOD_LOG, true));
Expand Down
26 changes: 25 additions & 1 deletion src/main/java/com/sammy/malum/registry/common/block/MalumBlockProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,19 @@ public static LodestoneBlockProperties RUNEWOOD_LEAVES() {
.isSuffocating(Blocks::never)
.isViewBlocking(Blocks::never)
.sound(SoundRegistry.RUNEWOOD_LEAVES)
.needsHoe().addTag(BlockTags.LEAVES);
.needsHoe();
}

public static LodestoneBlockProperties HANGING_RUNEWOOD_LEAVES() {
return new LodestoneBlockProperties()
.strength(0.05F)
.randomTicks()
.noOcclusion()
.isValidSpawn(Blocks::ocelotOrParrot)
.isSuffocating(Blocks::never)
.isViewBlocking(Blocks::never)
.sound(SoundRegistry.RUNEWOOD_LEAVES)
.needsHoe();
}

public static LodestoneBlockProperties RUNIC_SAP() {
Expand Down Expand Up @@ -96,6 +108,18 @@ public static LodestoneBlockProperties SOULWOOD_LEAVES() {
.sound(SoundRegistry.SOULWOOD_LEAVES);
}

public static LodestoneBlockProperties HANGING_SOULWOOD_LEAVES() {
return new LodestoneBlockProperties()
.needsHoe()
.strength(0.05F)
.randomTicks()
.noOcclusion()
.isValidSpawn(Blocks::ocelotOrParrot)
.isSuffocating(Blocks::never)
.isViewBlocking(Blocks::never)
.sound(SoundRegistry.SOULWOOD_LEAVES);
}

public static LodestoneBlockProperties CURSED_SAP() {
return new LodestoneBlockProperties()
.addTag(Tags.Blocks.STORAGE_BLOCKS)
Expand Down

0 comments on commit b2c69a4

Please sign in to comment.