Skip to content

Add Plough Blacklist and Whitelist tags #9346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: mc1.20.1/dev
Choose a base branch
from
+400 −378
Open

Add Plough Blacklist and Whitelist tags #9346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48f02a9
feat: allow ploughs to break stacked snow layers
VoidLeech Oct 9, 2025
8a0839d
feat: plough black/whitelist tags instead
VoidLeech Oct 22, 2025
8dbc3f1
chore: -imports
VoidLeech Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
752 changes: 377 additions & 375 deletions src/generated/resources/.cache/5971ca79ecd127e7d1e65be1cd906ac939e6a245
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/generated/resources/data/create/tags/blocks/plough_blacklist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"#minecraft:portals"
]
}
5 changes: 5 additions & 0 deletions src/generated/resources/data/create/tags/blocks/plough_whitelist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:snow"
]
}
2 changes: 2 additions & 0 deletions src/main/java/com/simibubi/create/AllTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ public enum AllBlockTags {
SUGAR_CANE_VARIANTS,
NON_HARVESTABLE,
SINGLE_BLOCK_INVENTORIES,
PLOUGH_WHITELIST,
PLOUGH_BLACKLIST,
CARDBOARD_STORAGE_BLOCKS(FORGE, "storage_blocks/cardboard"),
ANDESITE_ALLOY_STORAGE_BLOCKS(FORGE, "storage_blocks/andesite_alloy"),

Expand Down
8 changes: 5 additions & 3 deletions .../java/com/simibubi/create/content/contraptions/actors/plough/PloughMovementBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.simibubi.create.content.contraptions.actors.plough;

import com.simibubi.create.AllTags.AllBlockTags;
import com.simibubi.create.content.contraptions.actors.plough.PloughBlock.PloughFakePlayer;
import com.simibubi.create.content.contraptions.behaviour.MovementContext;
import com.simibubi.create.content.kinetics.base.BlockBreakingMovementBehaviour;
Expand All @@ -26,7 +27,6 @@
import net.minecraft.world.level.block.BubbleColumnBlock;
import net.minecraft.world.level.block.FarmBlock;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.block.NetherPortalBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.loot.LootParams;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
Expand Down Expand Up @@ -106,12 +106,14 @@ public boolean canBreak(Level world, BlockPos breakingPos, BlockState state) {
return false;
if (state.getBlock() instanceof BubbleColumnBlock)
return false;
if (state.getBlock() instanceof NetherPortalBlock)
return false;
if (state.getBlock() instanceof ITrackBlock)
return true;
if (state.getBlock() instanceof FakeTrackBlock)
return false;
if (AllBlockTags.PLOUGH_BLACKLIST.matches(state.getBlock()))
return false;
if (AllBlockTags.PLOUGH_WHITELIST.matches(state.getBlock()))
return true;
return state.getCollisionShape(world, breakingPos)
.isEmpty();
}
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ private static void genBlockTags(RegistrateTagsProvider<Block> provIn) {
Blocks.BUBBLE_CORAL_WALL_FAN, Blocks.FIRE_CORAL_WALL_FAN, Blocks.HORN_CORAL_WALL_FAN
);

prov.tag(AllBlockTags.PLOUGH_WHITELIST.tag)
.add(Blocks.SNOW);

prov.tag(AllBlockTags.PLOUGH_BLACKLIST.tag)
.addTag(BlockTags.PORTALS);

// COMPAT

TagGen.addOptional(prov.tag(AllBlockTags.NON_MOVABLE.tag), Mods.IE, List.of(
Expand Down