Skip to content

refactor: use neo datamap for stripping wood #1075

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

Merged
Builderdog841 merged 1 commit into from
Aug 25, 2026
Merged

refactor: use neo datamap for stripping wood #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
85 changes: 85 additions & 0 deletions src/generated/resources/data/neoforge/data_maps/block/strippables.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
{
"values": {
"aether_ii:amberoot_deposit": {
"stripped_block": "aether_ii:stripped_amberoot_log"
},
"aether_ii:amberoot_log": {
"stripped_block": "aether_ii:stripped_amberoot_log"
},
"aether_ii:amberoot_trunk": {
"stripped_block": "aether_ii:stripped_amberoot_trunk"
},
"aether_ii:amberoot_wood": {
"stripped_block": "aether_ii:stripped_amberoot_wood"
},
"aether_ii:greatroot_log": {
"stripped_block": "aether_ii:stripped_greatroot_log"
},
"aether_ii:greatroot_trunk": {
"stripped_block": "aether_ii:stripped_greatroot_trunk"
},
"aether_ii:greatroot_wood": {
"stripped_block": "aether_ii:stripped_greatroot_wood"
},
"aether_ii:guardian_log": {
"stripped_block": "aether_ii:stripped_guardian_log"
},
"aether_ii:guardian_log_slab": {
"stripped_block": "aether_ii:stripped_guardian_log_slab"
},
"aether_ii:guardian_trunk": {
"stripped_block": "aether_ii:stripped_guardian_trunk"
},
"aether_ii:guardian_wood": {
"stripped_block": "aether_ii:stripped_guardian_wood"
},
"aether_ii:guardian_wood_slab": {
"stripped_block": "aether_ii:stripped_guardian_wood_slab"
},
"aether_ii:infected_log": {
"stripped_block": "aether_ii:stripped_infected_log"
},
"aether_ii:infected_log_slab": {
"stripped_block": "aether_ii:stripped_infected_log_slab"
},
"aether_ii:infected_trunk": {
"stripped_block": "aether_ii:stripped_infected_trunk"
},
"aether_ii:infected_wood": {
"stripped_block": "aether_ii:stripped_infected_wood"
},
"aether_ii:infected_wood_slab": {
"stripped_block": "aether_ii:stripped_infected_wood_slab"
},
"aether_ii:mossy_wisproot_log": {
"stripped_block": "aether_ii:wisproot_log"
},
"aether_ii:mossy_wisproot_log_base": {
"stripped_block": "aether_ii:wisproot_log"
},
"aether_ii:mossy_wisproot_trunk": {
"stripped_block": "aether_ii:wisproot_trunk"
},
"aether_ii:mossy_wisproot_wood": {
"stripped_block": "aether_ii:wisproot_wood"
},
"aether_ii:skyroot_log": {
"stripped_block": "aether_ii:stripped_skyroot_log"
},
"aether_ii:skyroot_trunk": {
"stripped_block": "aether_ii:stripped_skyroot_trunk"
},
"aether_ii:skyroot_wood": {
"stripped_block": "aether_ii:stripped_skyroot_wood"
},
"aether_ii:wisproot_log": {
"stripped_block": "aether_ii:stripped_wisproot_log"
},
"aether_ii:wisproot_trunk": {
"stripped_block": "aether_ii:stripped_wisproot_trunk"
},
"aether_ii:wisproot_wood": {
"stripped_block": "aether_ii:stripped_wisproot_wood"
}
}
}
40 changes: 1 addition & 39 deletions src/main/java/com/aetherteam/aetherii/block/AetherIIBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,39 +1135,6 @@ public static void registerFluidInteractions() {
));
}

/**
* Blocks able to be flattened with {@link ItemAbilities#AXE_STRIP}, and the equivalent result block.
*/
public static final Map<Supplier<DeferredBlock<? extends Block>>, Supplier<DeferredBlock<? extends Block>>> STRIPPABLES = new ImmutableMap.Builder<Supplier<DeferredBlock<? extends Block>>, Supplier<DeferredBlock<? extends Block>>>()
.put(() -> AetherIIBlocks.SKYROOT_LOG, () -> AetherIIBlocks.STRIPPED_SKYROOT_LOG)
.put(() -> AetherIIBlocks.SKYROOT_WOOD, () -> AetherIIBlocks.STRIPPED_SKYROOT_WOOD)
.put(() -> AetherIIBlocks.SKYROOT_TRUNK, () -> AetherIIBlocks.STRIPPED_SKYROOT_TRUNK)
.put(() -> AetherIIBlocks.GREATROOT_LOG, () -> AetherIIBlocks.STRIPPED_GREATROOT_LOG)
.put(() -> AetherIIBlocks.GREATROOT_WOOD, () -> AetherIIBlocks.STRIPPED_GREATROOT_WOOD)
.put(() -> AetherIIBlocks.GREATROOT_TRUNK, () -> AetherIIBlocks.STRIPPED_GREATROOT_TRUNK)
.put(() -> AetherIIBlocks.WISPROOT_LOG, () -> AetherIIBlocks.STRIPPED_WISPROOT_LOG)
.put(() -> AetherIIBlocks.WISPROOT_WOOD, () -> AetherIIBlocks.STRIPPED_WISPROOT_WOOD)
.put(() -> AetherIIBlocks.WISPROOT_TRUNK, () -> AetherIIBlocks.STRIPPED_WISPROOT_TRUNK)
.put(() -> AetherIIBlocks.MOSSY_WISPROOT_LOG, () -> AetherIIBlocks.WISPROOT_LOG)
.put(() -> AetherIIBlocks.MOSSY_WISPROOT_WOOD, () -> AetherIIBlocks.WISPROOT_WOOD)
.put(() -> AetherIIBlocks.MOSSY_WISPROOT_TRUNK, () -> AetherIIBlocks.WISPROOT_TRUNK)
.put(() -> AetherIIBlocks.MOSSY_WISPROOT_LOG_BASE, () -> AetherIIBlocks.WISPROOT_LOG)
.put(() -> AetherIIBlocks.AMBEROOT_LOG, () -> AetherIIBlocks.STRIPPED_AMBEROOT_LOG)
.put(() -> AetherIIBlocks.AMBEROOT_DEPOSIT, () -> AetherIIBlocks.STRIPPED_AMBEROOT_LOG)
.put(() -> AetherIIBlocks.AMBEROOT_WOOD, () -> AetherIIBlocks.STRIPPED_AMBEROOT_WOOD)
.put(() -> AetherIIBlocks.AMBEROOT_TRUNK, () -> AetherIIBlocks.STRIPPED_AMBEROOT_TRUNK)
.put(() -> AetherIIBlocks.GUARDIAN_LOG, () -> AetherIIBlocks.STRIPPED_GUARDIAN_LOG)
.put(() -> AetherIIBlocks.GUARDIAN_LOG_SLAB, () -> AetherIIBlocks.STRIPPED_GUARDIAN_LOG_SLAB)
.put(() -> AetherIIBlocks.GUARDIAN_WOOD, () -> AetherIIBlocks.STRIPPED_GUARDIAN_WOOD)
.put(() -> AetherIIBlocks.GUARDIAN_WOOD_SLAB, () -> AetherIIBlocks.STRIPPED_GUARDIAN_WOOD_SLAB)
.put(() -> AetherIIBlocks.GUARDIAN_TRUNK, () -> AetherIIBlocks.STRIPPED_GUARDIAN_TRUNK)
.put(() -> AetherIIBlocks.INFECTED_LOG, () -> AetherIIBlocks.STRIPPED_INFECTED_LOG)
.put(() -> AetherIIBlocks.INFECTED_LOG_SLAB, () -> AetherIIBlocks.STRIPPED_INFECTED_LOG_SLAB)
.put(() -> AetherIIBlocks.INFECTED_WOOD, () -> AetherIIBlocks.STRIPPED_INFECTED_WOOD)
.put(() -> AetherIIBlocks.INFECTED_WOOD_SLAB, () -> AetherIIBlocks.STRIPPED_INFECTED_WOOD_SLAB)
.put(() -> AetherIIBlocks.INFECTED_TRUNK, () -> AetherIIBlocks.STRIPPED_INFECTED_TRUNK)
.build();

/**
* Blocks able to be flattened with {@link ItemAbilities#SHOVEL_FLATTEN}, and the equivalent result block.
*/
Expand All @@ -1189,16 +1156,11 @@ public static void registerFluidInteractions() {
.build();

public static BlockState registerBlockModifications(LevelAccessor levelAccessor, ItemAbility toolAction, BlockPos blockPos, BlockState oldState, BlockState newState) {
Map<Block, Block> strippables = STRIPPABLES.entrySet().stream().collect(Collectors.toMap((e) -> e.getKey().get().get(), (e) -> e.getValue().get().get()));
Map<Block, Block> flattenables = FLATTENABLES.entrySet().stream().collect(Collectors.toMap((e) -> e.getKey().get().get(), (e) -> e.getValue().get().get()));
Map<Block, Block> tillables = TILLABLES.entrySet().stream().collect(Collectors.toMap((e) -> e.getKey().get().get(), (e) -> e.getValue().get().get()));

Block oldBlock = oldState.getBlock();
if (toolAction == ItemAbilities.AXE_STRIP) {
if (strippables.containsKey(oldBlock)) {
newState = strippables.get(oldBlock).withPropertiesOf(oldState);
}
} else if (toolAction == ItemAbilities.SHOVEL_FLATTEN) {
if (toolAction == ItemAbilities.SHOVEL_FLATTEN) {
if (flattenables.containsKey(oldBlock)) {
newState = flattenables.get(oldBlock).withPropertiesOf(oldState);
}
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/com/aetherteam/aetherii/data/generators/AetherIIDataMapData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import net.neoforged.neoforge.registries.datamaps.builtin.Compostable;
import net.neoforged.neoforge.registries.datamaps.builtin.FurnaceFuel;
import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps;
import net.neoforged.neoforge.registries.datamaps.builtin.Strippable;

import java.util.concurrent.CompletableFuture;

Expand Down Expand Up @@ -117,6 +118,35 @@ protected void gather(HolderLookup.Provider provider) {
fuels.add(AetherIIBlocks.SKYROOT_TWIG.getId(), new FurnaceFuel(200), false);
fuels.add(AetherIIItems.SKYROOT_STICK, new FurnaceFuel(100), false);

var strippables = this.builder(NeoForgeDataMaps.STRIPPABLES);
strippables.add(AetherIIBlocks.SKYROOT_LOG, new Strippable(AetherIIBlocks.STRIPPED_SKYROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.SKYROOT_WOOD, new Strippable(AetherIIBlocks.STRIPPED_SKYROOT_WOOD.get()), false);
strippables.add(AetherIIBlocks.SKYROOT_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_SKYROOT_TRUNK.get()), false);
strippables.add(AetherIIBlocks.GREATROOT_LOG, new Strippable(AetherIIBlocks.STRIPPED_GREATROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.GREATROOT_WOOD, new Strippable(AetherIIBlocks.STRIPPED_GREATROOT_WOOD.get()), false);
strippables.add(AetherIIBlocks.GREATROOT_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_GREATROOT_TRUNK.get()), false);
strippables.add(AetherIIBlocks.WISPROOT_LOG, new Strippable(AetherIIBlocks.STRIPPED_WISPROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.WISPROOT_WOOD, new Strippable(AetherIIBlocks.STRIPPED_WISPROOT_WOOD.get()), false);
strippables.add(AetherIIBlocks.WISPROOT_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_WISPROOT_TRUNK.get()), false);
strippables.add(AetherIIBlocks.MOSSY_WISPROOT_LOG, new Strippable(AetherIIBlocks.WISPROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.MOSSY_WISPROOT_WOOD, new Strippable(AetherIIBlocks.WISPROOT_WOOD.get()), false);
strippables.add(AetherIIBlocks.MOSSY_WISPROOT_TRUNK, new Strippable(AetherIIBlocks.WISPROOT_TRUNK.get()), false);
strippables.add(AetherIIBlocks.MOSSY_WISPROOT_LOG_BASE, new Strippable(AetherIIBlocks.WISPROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.AMBEROOT_LOG, new Strippable(AetherIIBlocks.STRIPPED_AMBEROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.AMBEROOT_DEPOSIT, new Strippable(AetherIIBlocks.STRIPPED_AMBEROOT_LOG.get()), false);
strippables.add(AetherIIBlocks.AMBEROOT_WOOD, new Strippable(AetherIIBlocks.STRIPPED_AMBEROOT_WOOD.get()), false);
strippables.add(AetherIIBlocks.AMBEROOT_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_AMBEROOT_TRUNK.get()), false);
strippables.add(AetherIIBlocks.GUARDIAN_LOG, new Strippable(AetherIIBlocks.STRIPPED_GUARDIAN_LOG.get()), false);
strippables.add(AetherIIBlocks.GUARDIAN_LOG_SLAB, new Strippable(AetherIIBlocks.STRIPPED_GUARDIAN_LOG_SLAB.get()), false);
strippables.add(AetherIIBlocks.GUARDIAN_WOOD, new Strippable(AetherIIBlocks.STRIPPED_GUARDIAN_WOOD.get()), false);
strippables.add(AetherIIBlocks.GUARDIAN_WOOD_SLAB, new Strippable(AetherIIBlocks.STRIPPED_GUARDIAN_WOOD_SLAB.get()), false);
strippables.add(AetherIIBlocks.GUARDIAN_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_GUARDIAN_TRUNK.get()), false);
strippables.add(AetherIIBlocks.INFECTED_LOG, new Strippable(AetherIIBlocks.STRIPPED_INFECTED_LOG.get()), false);
strippables.add(AetherIIBlocks.INFECTED_LOG_SLAB, new Strippable(AetherIIBlocks.STRIPPED_INFECTED_LOG_SLAB.get()), false);
strippables.add(AetherIIBlocks.INFECTED_WOOD, new Strippable(AetherIIBlocks.STRIPPED_INFECTED_WOOD.get()), false);
strippables.add(AetherIIBlocks.INFECTED_WOOD_SLAB, new Strippable(AetherIIBlocks.STRIPPED_INFECTED_WOOD_SLAB.get()), false);
strippables.add(AetherIIBlocks.INFECTED_TRUNK, new Strippable(AetherIIBlocks.STRIPPED_INFECTED_TRUNK.get()), false);

var amberHourglassFuels = this.builder(AetherIIDataMaps.AMBER_HOURGLASS_FUELS);
amberHourglassFuels.add(AetherIIItems.GOLDEN_AMBER, new AmberHourglassFuel(400), false);
amberHourglassFuels.add(AetherIIBlocks.GOLDEN_AMBER_BLOCK.getId(), new AmberHourglassFuel(4000), false);
Expand Down