-
Notifications
You must be signed in to change notification settings - Fork 279
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
976 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package carpet.commands; | ||
|
|
||
| import carpet.CarpetSettings; | ||
| import com.mojang.brigadier.CommandDispatcher; | ||
| import com.mojang.brigadier.builder.LiteralArgumentBuilder; | ||
| import com.mojang.brigadier.exceptions.CommandSyntaxException; | ||
| import net.minecraft.server.command.ServerCommandSource; | ||
| import net.minecraft.command.arguments.EntityArgumentType; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.entity.effect.StatusEffects; | ||
| import net.minecraft.entity.effect.StatusEffectInstance; | ||
| import net.minecraft.world.GameMode; | ||
|
|
||
| import static net.minecraft.server.command.CommandManager.argument; | ||
| import static net.minecraft.server.command.CommandManager.literal; | ||
|
|
||
| public class CameraModeCommand | ||
| { | ||
| public static void register(CommandDispatcher<ServerCommandSource> dispatcher) | ||
| { | ||
| LiteralArgumentBuilder<ServerCommandSource> camera = literal("c"). | ||
| requires((player) -> CarpetSettings.getBool("commandCameramode")). | ||
| executes((c) -> cameraMode(c.getSource(), c.getSource().getPlayer())). | ||
| then(argument("player", EntityArgumentType.player()). | ||
| executes( (c) -> cameraMode(c.getSource(), EntityArgumentType.getPlayer(c, "player")))); | ||
|
|
||
| LiteralArgumentBuilder<ServerCommandSource> survival = literal("s"). | ||
| requires((player) -> CarpetSettings.getBool("commandCameramode")). | ||
| executes((c) -> survivalMode( | ||
| c.getSource(), | ||
| c.getSource().getPlayer())). | ||
| then(argument("player", EntityArgumentType.player()). | ||
| executes( (c) -> survivalMode(c.getSource(), EntityArgumentType.getPlayer(c, "player")))); | ||
|
|
||
| dispatcher.register(camera); | ||
| dispatcher.register(survival); | ||
| } | ||
| private static boolean iCanHasPermissions(ServerCommandSource source, PlayerEntity player) | ||
| { | ||
| try | ||
| { | ||
| return source.hasPermissionLevel(2) || source.getPlayer() == player; | ||
| } | ||
| catch (CommandSyntaxException e) | ||
| { | ||
| return true; // shoudn't happen because server has all permissions anyways | ||
| } | ||
| } | ||
| private static int cameraMode(ServerCommandSource source, PlayerEntity player) | ||
| { | ||
| if (!(iCanHasPermissions(source, player))) return 0; | ||
| player.setGameMode(GameMode.SPECTATOR); | ||
| player.addPotionEffect(new StatusEffectInstance(StatusEffects.NIGHT_VISION, 999999, 0, false, false)); | ||
| player.addPotionEffect(new StatusEffectInstance(StatusEffects.CONDUIT_POWER, 999999, 0, false, false)); | ||
| return 1; | ||
| } | ||
| private static int survivalMode(ServerCommandSource source, PlayerEntity player) | ||
| { | ||
| if (!(iCanHasPermissions(source, player))) return 0; | ||
| player.setGameMode(GameMode.SURVIVAL); | ||
| player.removePotionEffect(StatusEffects.NIGHT_VISION); | ||
| player.removePotionEffect(StatusEffects.CONDUIT_POWER); | ||
| return 1; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| package carpet.commands; | ||
|
|
||
| import carpet.CarpetSettings; | ||
| import carpet.utils.Messenger; | ||
| import com.google.common.collect.Lists; | ||
| import com.mojang.brigadier.CommandDispatcher; | ||
| import com.mojang.brigadier.builder.LiteralArgumentBuilder; | ||
| import com.mojang.brigadier.arguments.IntegerArgumentType; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.pattern.CachedBlockPosition; | ||
| import net.minecraft.server.command.ServerCommandSource; | ||
| import net.minecraft.command.arguments.BlockPosArgumentType; | ||
| import net.minecraft.command.arguments.BlockPredicateArgumentType; | ||
| import net.minecraft.command.arguments.BlockStateArgument; | ||
| import net.minecraft.command.arguments.BlockStateArgumentType; | ||
| import net.minecraft.inventory.Inventory; | ||
| import net.minecraft.block.entity.BlockEntity; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.server.world.ServerWorld; | ||
|
|
||
| import java.util.List; | ||
| import java.util.function.Predicate; | ||
|
|
||
| import static net.minecraft.server.command.CommandManager.argument; | ||
| import static net.minecraft.server.command.CommandManager.literal; | ||
|
|
||
| public class DrawCommand | ||
| { | ||
| public static void register(CommandDispatcher<ServerCommandSource> dispatcher) | ||
| { | ||
| LiteralArgumentBuilder<ServerCommandSource> command = literal("draw"). | ||
| requires((player) -> CarpetSettings.getBool("commandDraw")). | ||
| then(literal("sphere"). | ||
| then(argument("center",BlockPosArgumentType.create()). | ||
| then(argument("radius",IntegerArgumentType.integer(1)). | ||
| then(argument("block",BlockStateArgumentType.create()). | ||
| executes((c)-> drawCircle( | ||
| c.getSource(), | ||
| BlockPosArgumentType.getBlockPos(c, "center"), | ||
| IntegerArgumentType.getInteger(c, "radius"), | ||
| BlockStateArgumentType.getBlockState (c,"block"), | ||
| null | ||
| ) | ||
| ). | ||
| then(literal("replace"). | ||
| then(argument("filter",BlockPredicateArgumentType.create()) | ||
| .executes((c)-> drawCircle( | ||
| c.getSource(), | ||
| BlockPosArgumentType.getBlockPos(c, "center"), | ||
| IntegerArgumentType.getInteger(c, "radius"), | ||
| BlockStateArgumentType.getBlockState(c,"block"), | ||
| BlockPredicateArgumentType.getBlockPredicate(c, | ||
| "filter") | ||
| )))))))); | ||
| dispatcher.register(command); | ||
| } | ||
|
|
||
|
|
||
| private static int drawCircle(ServerCommandSource source, BlockPos pos, int radius, BlockStateArgument block, | ||
| Predicate<CachedBlockPosition> replacement) | ||
| { | ||
| return drawCircle(source, pos, (double)radius, (double)radius, (double)radius, block, replacement, false); | ||
| } | ||
| private static int drawCircle(ServerCommandSource source, BlockPos pos, double radiusX, double radiusY, double radiusZ, | ||
| BlockStateArgument block, Predicate<CachedBlockPosition> replacement, boolean solid) | ||
| { | ||
| int affected = 0; | ||
| ServerWorld world = source.getWorld(); | ||
|
|
||
| radiusX += 0.5; | ||
| radiusY += 0.5; | ||
| radiusZ += 0.5; | ||
|
|
||
| final double invRadiusX = 1 / radiusX; | ||
| final double invRadiusY = 1 / radiusY; | ||
| final double invRadiusZ = 1 / radiusZ; | ||
|
|
||
| final int ceilRadiusX = (int) Math.ceil(radiusX); | ||
| final int ceilRadiusY = (int) Math.ceil(radiusY); | ||
| final int ceilRadiusZ = (int) Math.ceil(radiusZ); | ||
|
|
||
| BlockPos.Mutable mbpos = new BlockPos.Mutable(pos); | ||
| List<BlockPos> list = Lists.newArrayList(); | ||
|
|
||
| double nextXn = 0; | ||
|
|
||
| forX: for (int x = 0; x <= ceilRadiusX; ++x) { | ||
| final double xn = nextXn; | ||
| nextXn = (x + 1) * invRadiusX; | ||
| double nextYn = 0; | ||
| forY: for (int y = 0; y <= ceilRadiusY; ++y) { | ||
| final double yn = nextYn; | ||
| nextYn = (y + 1) * invRadiusY; | ||
| double nextZn = 0; | ||
| forZ: for (int z = 0; z <= ceilRadiusZ; ++z) { | ||
| final double zn = nextZn; | ||
| nextZn = (z + 1) * invRadiusZ; | ||
|
|
||
| double distanceSq = lengthSq(xn, yn, zn); | ||
| if (distanceSq > 1) { | ||
| if (z == 0) { | ||
| if (y == 0) { | ||
| break forX; | ||
| } | ||
| break forY; | ||
| } | ||
| break forZ; | ||
| } | ||
|
|
||
| if (!solid) { | ||
| if (lengthSq(nextXn, yn, zn) <= 1 && lengthSq(xn, nextYn, zn) <= 1 && lengthSq(xn, yn, nextZn) <= 1) { | ||
| continue; | ||
| } | ||
| } | ||
|
|
||
| for (int xmod = -1; xmod < 2; xmod+= 2) | ||
| { | ||
| for (int ymod = -1; ymod < 2; ymod += 2) | ||
| { | ||
| for (int zmod = -1; zmod < 2; zmod += 2) | ||
| { | ||
| mbpos.set(pos.getX()+xmod*x, pos.getY()+ymod*y, pos.getZ()+zmod*z); | ||
| if (replacement == null || replacement.test( | ||
| new CachedBlockPosition( world, mbpos, true))) | ||
| { | ||
| BlockEntity tileentity = world.getBlockEntity(mbpos); | ||
| if (tileentity instanceof Inventory) | ||
| { | ||
| ((Inventory)tileentity).clear(); | ||
| } | ||
|
|
||
| if (block.setBlockState( | ||
| world, | ||
| mbpos, | ||
| 2 | (CarpetSettings.getBool("fillUpdates") ?0:1024) | ||
| )) | ||
| { | ||
| list.add(mbpos.toImmutable()); | ||
| ++affected; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| if (CarpetSettings.getBool("fillUpdates")) | ||
| { | ||
|
|
||
| for (BlockPos blockpos1 : list) | ||
| { | ||
| Block blokc = world.getBlockState(blockpos1).getBlock(); | ||
| world.updateNeighbors(blockpos1, blokc); // or always version???? | ||
| } | ||
| } | ||
| Messenger.m(source, "gi Filled "+affected+" blocks"); | ||
|
|
||
| return 1; | ||
| } | ||
| private static double lengthSq(double x, double y, double z) | ||
| { | ||
| return (x * x) + (y * y) + (z * z); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
src/main/java/net/fabricmc/example/mixin/ExampleMixin.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters