Skip to content

Dev coolfish #22

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
ifishcool merged 4 commits into from
Feb 24, 2026
Merged

Dev coolfish #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d1a9f5
feat(command): 添加Y轴偏移参数支持
ifishcool Feb 24, 2026
04f0f2e
feat(box3): 更改平世界预设的语言键名并移除相关配置文件
ifishcool Feb 24, 2026
48af07e
feat(command): 添加Y轴偏移量参数到box3import命令
ifishcool Feb 24, 2026
b3c5db0
feat(block): 添加BouncePadBlock的fallOn方法重写
ifishcool Feb 24, 2026
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
2 changes: 1 addition & 1 deletion Fabric-1.20.1/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ loader_version=0.18.4
loom_version=1.15-SNAPSHOT

# Mod Properties
mod_version=1.4.0-mc1.20.1
mod_version=1.4.1-mc1.20.1
maven_group=com.box3lab
archives_base_name=box3

Expand Down
10 changes: 10 additions & 0 deletions Fabric-1.20.1/src/main/java/com/box3lab/block/BouncePadBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,14 @@ public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {

entity.setDeltaMovement(vel);
}

@Override
public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, float fallDistance) {

if (entity.isSuppressingBounce()) {
super.fallOn(level, state, pos, entity, fallDistance);
} else {
entity.resetFallDistance();
}
}
}
64 changes: 51 additions & 13 deletions Fabric-1.20.1/src/main/java/com/box3lab/command/ModCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.box3lab.util.Box3ImportFiles;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.suggestion.SuggestionProvider;

import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
Expand Down Expand Up @@ -46,37 +47,71 @@ public static void register() {
.executes(context -> listBox3ImportFiles(context.getSource()))
.then(argument("fileName", StringArgumentType.word())
.suggests(BOX3_FILE_SUGGESTIONS)
// /box3import <fileName>
.executes(context -> executeBox3Import(
context.getSource(),
StringArgumentType.getString(
context,
"fileName"),
0,
false,
false))
.then(argument("ignoreBarrier",
BoolArgumentType.bool())
// /box3import <fileName> <offsetY>
.then(argument("offsetY",
IntegerArgumentType.integer())
.executes(context -> executeBox3Import(
context.getSource(),
StringArgumentType
.getString(context,
.getString(
context,
"fileName"),
BoolArgumentType.getBool(
context,
"ignoreBarrier"),
IntegerArgumentType
.getInteger(
context,
"offsetY"),
false,
false))
.then(argument("ignoreWater",
// /box3import <fileName>
// <offsetY> <ignoreBarrier>
.then(argument("ignoreBarrier",
BoolArgumentType.bool())
.executes(context -> executeBox3Import(
context.getSource(),
StringArgumentType
.getString(context,
.getString(
context,
"fileName"),
IntegerArgumentType
.getInteger(
context,
"offsetY"),
BoolArgumentType.getBool(
context,
"ignoreBarrier"),
BoolArgumentType.getBool(
context,
"ignoreWater")))))));
false))
// /box3import
// <fileName>
// <offsetY>
// <ignoreBarrier>
// <ignoreWater>
.then(argument("ignoreWater",
BoolArgumentType.bool())
.executes(context -> executeBox3Import(
context.getSource(),
StringArgumentType
.getString(
context,
"fileName"),
IntegerArgumentType
.getInteger(
context,
"offsetY"),
BoolArgumentType.getBool(
context,
"ignoreBarrier"),
BoolArgumentType.getBool(
context,
"ignoreWater"))))))));

dispatcher.register(
literal("box3barrier")
Expand Down Expand Up @@ -134,13 +169,16 @@ private static String resolveMapName(String fileName) {
}

private static int executeBox3Import(CommandSourceStack source, String fileName,
boolean ignoreBarrier, boolean useVanillaWater) {
int offsetY, boolean ignoreBarrier, boolean useVanillaWater) {
ServerLevel level = source.getServer().overworld();
try {
ServerPlayer player = source.getPlayer();
String mapName = resolveMapName(fileName);
var basePos = player != null ? player.position() : new BlockPos(0, 0, 0).getCenter();
var offsetPos = basePos.add(0, offsetY, 0);

VoxelImport.apply(null, level, mapName,
player != null ? player.position() : new BlockPos(0, 0, 0).getCenter(),
offsetPos,
player,
ignoreBarrier,
useVanillaWater);
Expand Down
3 changes: 2 additions & 1 deletion Fabric-1.20.1/src/main/resources/assets/box3/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,5 +411,6 @@
"command.box3.box3barrier.status": "Barrier visible: %s",
"command.box3.box3barrier.set": "Barrier visibility set to: %s",
"command.box3.box3barrier.toggled": "Barrier visibility toggled to: %s (re-enter the world to fully apply)",
"item.box3.model_destroyer": "Model destruction bucket"
"item.box3.model_destroyer": "Model destruction bucket",
"flat_world_preset.box3.box3_plains_world": "Box3 Plains"
}
3 changes: 2 additions & 1 deletion Fabric-1.20.1/src/main/resources/assets/box3/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,5 +399,6 @@
"command.box3.box3barrier.status": "屏障可见状态：%s",
"command.box3.box3barrier.set": "屏障可见状态已设置为：%s",
"command.box3.box3barrier.toggled": "屏障可见状态已切换为：%s（重新进入世界以完全生效）",
"item.box3.model_destroyer": "模型销毁桶"
"item.box3.model_destroyer": "模型销毁桶",
"flat_world_preset.box3.box3_plains_world": "神岛平原"
}
13 changes: 13 additions & 0 deletions .../src/main/resources/data/box3/worldgen/flat_level_generator_preset/box3_plains_world.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"display": "box3:grass",
"settings": {
"biome": "minecraft:plains",
"lakes": false,
"features": false,
"layers": [
{ "block": "box3:stone", "height": 1 },
{ "block": "box3:dirt", "height": 6 },
{ "block": "box3:grass", "height": 1 }
]
}
}
4 changes: 4 additions & 0 deletions .../src/main/resources/data/minecraft/tags/worldgen/flat_level_generator_preset/visible.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"replace": false,
"values": ["box3:box3_plains_world", "box3:box3_custom_noise"]
}
2 changes: 1 addition & 1 deletion Fabric-1.21.1/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ loader_version=0.18.4
loom_version=1.15-SNAPSHOT

# Mod Properties
mod_version=1.4.0-mc1.21.1
mod_version=1.4.1-mc1.21.1
maven_group=com.box3lab
archives_base_name=box3

Expand Down
10 changes: 10 additions & 0 deletions Fabric-1.21.1/src/main/java/com/box3lab/block/BouncePadBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,14 @@ public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {

entity.setDeltaMovement(vel);
}

@Override
public void fallOn(Level level, BlockState state, BlockPos pos, Entity entity, float fallDistance) {

if (entity.isSuppressingBounce()) {
super.fallOn(level, state, pos, entity, fallDistance);
} else {
entity.resetFallDistance();
}
}
}
Loading