mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge bab52ee85d into 550296edc5

This commit is contained in:
Jeff Smith 2024-04-21 19:31:29 +02:00 committed by GitHub
parent 550296edc5 bab52ee85d
commit 1b49bacc50
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 195 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeDataProvider.java
View File

@ -63,6 +63,7 @@ public static class ToolBuilder {
private @Nullable Item craftingItem;
private @Nullable Float damageMultiplier = null;
private @Nullable TagKey<Block> breakable;
private String peripheralType = "";
private boolean allowEnchantments = false;
private TurtleToolDurability consumeDurability = TurtleToolDurability.NEVER;
@ -96,6 +97,11 @@ public ToolBuilder craftingItem(Item craftingItem) {
return this;
}
public ToolBuilder peripheralType(String peripheralType) {
this.peripheralType = peripheralType;
return this;
}
/**
* The amount of damage a swing of this tool will do. This is multiplied by {@link Attributes#ATTACK_DAMAGE} to
* get the final damage.
@ -162,6 +168,7 @@ public void add(Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> add) {
if (consumeDurability != TurtleToolDurability.NEVER) {
s.addProperty("consumeDurability", consumeDurability.getSerializedName());
}
s.addProperty("peripheralType", peripheralType);
}));
}
}

10
projects/common/src/main/java/dan200/computercraft/data/TurtleUpgradeProvider.java
View File

@ -28,11 +28,11 @@ protected void addUpgrades(Consumer<Upgrade<TurtleUpgradeSerialiser<?>>> addUpgr
simpleWithCustomItem(id("wireless_modem_normal"), TurtleSerialisers.WIRELESS_MODEM_NORMAL.get(), Items.WIRELESS_MODEM_NORMAL.get()).add(addUpgrade);
simpleWithCustomItem(id("wireless_modem_advanced"), TurtleSerialisers.WIRELESS_MODEM_ADVANCED.get(), Items.WIRELESS_MODEM_ADVANCED.get()).add(addUpgrade);
tool(vanilla("diamond_axe"), net.minecraft.world.item.Items.DIAMOND_AXE).damageMultiplier(6.0f).add(addUpgrade);
tool(vanilla("diamond_pickaxe"), net.minecraft.world.item.Items.DIAMOND_PICKAXE).add(addUpgrade);
tool(vanilla("diamond_hoe"), net.minecraft.world.item.Items.DIAMOND_HOE).breakable(Blocks.TURTLE_HOE_BREAKABLE).add(addUpgrade);
tool(vanilla("diamond_shovel"), net.minecraft.world.item.Items.DIAMOND_SHOVEL).breakable(Blocks.TURTLE_SHOVEL_BREAKABLE).add(addUpgrade);
tool(vanilla("diamond_sword"), net.minecraft.world.item.Items.DIAMOND_SWORD).breakable(Blocks.TURTLE_SWORD_BREAKABLE).damageMultiplier(9.0f).add(addUpgrade);
tool(vanilla("diamond_axe"), net.minecraft.world.item.Items.DIAMOND_AXE).peripheralType("axe").damageMultiplier(6.0f).add(addUpgrade);
tool(vanilla("diamond_pickaxe"), net.minecraft.world.item.Items.DIAMOND_PICKAXE).peripheralType("pickaxe").add(addUpgrade);
tool(vanilla("diamond_hoe"), net.minecraft.world.item.Items.DIAMOND_HOE).breakable(Blocks.TURTLE_HOE_BREAKABLE).peripheralType("hoe").add(addUpgrade);
tool(vanilla("diamond_shovel"), net.minecraft.world.item.Items.DIAMOND_SHOVEL).breakable(Blocks.TURTLE_SHOVEL_BREAKABLE).peripheralType("shovel").add(addUpgrade);
tool(vanilla("diamond_sword"), net.minecraft.world.item.Items.DIAMOND_SWORD).breakable(Blocks.TURTLE_SWORD_BREAKABLE).peripheralType("sword").damageMultiplier(9.0f).add(addUpgrade);
}
private static ResourceLocation id(String id) {

69
projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/ToolPeripheral.java Normal file
View File

@ -0,0 +1,69 @@
package dan200.computercraft.shared.turtle.upgrades;
import dan200.computercraft.api.lua.LuaException;
import dan200.computercraft.api.lua.LuaFunction;
import dan200.computercraft.api.lua.MethodResult;
import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.api.turtle.ITurtleAccess;
import dan200.computercraft.api.turtle.TurtleSide;
import dan200.computercraft.shared.turtle.core.InteractDirection;
import dan200.computercraft.shared.turtle.core.TurtleToolCommand;
import javax.annotation.Nullable;
public class ToolPeripheral implements IPeripheral {
private final ITurtleAccess turtle;
private final TurtleSide side;
private final String type;
public ToolPeripheral(ITurtleAccess turtle, TurtleSide side, String type) {
this.turtle = turtle;
this.side = side;
this.type = type;
}
@Override
public String getType() {
return type;
}
@LuaFunction
public final MethodResult digDown() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.dig(InteractDirection.DOWN, side));
}
@LuaFunction
public final MethodResult digUp() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.dig(InteractDirection.UP, side));
}
@LuaFunction
public final MethodResult dig() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.dig(InteractDirection.FORWARD, side));
}
@LuaFunction
public final MethodResult attackDown() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.attack(InteractDirection.DOWN, side));
}
@LuaFunction
public final MethodResult attackUp() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.attack(InteractDirection.UP, side));
}
@LuaFunction
public final MethodResult attack() throws LuaException {
return turtle.executeCommand(TurtleToolCommand.attack(InteractDirection.FORWARD, side));
}
@Override
public boolean equals(@Nullable IPeripheral other) {
return other instanceof ToolPeripheral && type.equals(other.getType());
}
@Override
public Object getTarget() {
return turtle;
}
}

12
projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
View File

@ -5,6 +5,7 @@
package dan200.computercraft.shared.turtle.upgrades;
import dan200.computercraft.api.ComputerCraftTags;
import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.api.turtle.*;
import dan200.computercraft.shared.platform.PlatformHelper;
import dan200.computercraft.shared.turtle.TurtleUtil;
@ -55,17 +56,19 @@ public class TurtleTool extends AbstractTurtleUpgrade {
final boolean allowEnchantments;
final TurtleToolDurability consumeDurability;
final @Nullable TagKey<Block> breakable;
final String peripheralType;
public TurtleTool(
ResourceLocation id, String adjective, Item craftItem, ItemStack toolItem, float damageMulitiplier,
boolean allowEnchantments, TurtleToolDurability consumeDurability, @Nullable TagKey<Block> breakable
boolean allowEnchantments, TurtleToolDurability consumeDurability, @Nullable TagKey<Block> breakable, String peripheralType
) {
super(id, TurtleUpgradeType.TOOL, adjective, new ItemStack(craftItem));
super(id, TurtleUpgradeType.BOTH, adjective, new ItemStack(craftItem));
item = toolItem;
this.damageMulitiplier = damageMulitiplier;
this.allowEnchantments = allowEnchantments;
this.consumeDurability = consumeDurability;
this.breakable = breakable;
this.peripheralType = peripheralType;
}
@Override
@ -104,6 +107,11 @@ public ItemStack getUpgradeItem(CompoundTag upgradeData) {
return item;
}
@Override
public IPeripheral createPeripheral(ITurtleAccess turtle, TurtleSide side) {
return new ToolPeripheral(turtle, side, peripheralType);
}
private ItemStack getToolStack(ITurtleAccess turtle, TurtleSide side) {
return getUpgradeItem(turtle.getUpgradeNBTData(side)).copy();
}

7
projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleToolSerialiser.java
View File

@ -32,6 +32,7 @@ public TurtleTool fromJson(ResourceLocation id, JsonObject object) {
var craftingItem = GsonHelper.getAsItem(object, "craftingItem", toolItem);
var damageMultiplier = GsonHelper.getAsFloat(object, "damageMultiplier", 3.0f);
var allowEnchantments = GsonHelper.getAsBoolean(object, "allowEnchantments", false);
var peripheralType = GsonHelper.getAsString(object, "peripheralType", "");
var consumeDurability = TurtleToolDurability.CODEC.byName(GsonHelper.getAsString(object, "consumeDurability", null), TurtleToolDurability.NEVER);
TagKey<Block> breakable = null;
@ -40,7 +41,7 @@ public TurtleTool fromJson(ResourceLocation id, JsonObject object) {
breakable = TagKey.create(Registries.BLOCK, tag);
}
return new TurtleTool(id, adjective, craftingItem, new ItemStack(toolItem), damageMultiplier, allowEnchantments, consumeDurability, breakable);
return new TurtleTool(id, adjective, craftingItem, new ItemStack(toolItem), damageMultiplier, allowEnchantments, consumeDurability, breakable, peripheralType);
}
@Override
@ -54,9 +55,10 @@ public TurtleTool fromNetwork(ResourceLocation id, FriendlyByteBuf buffer) {
var damageMultiplier = buffer.readFloat();
var allowsEnchantments = buffer.readBoolean();
var consumesDurability = buffer.readEnum(TurtleToolDurability.class);
var peripheralType = buffer.readUtf();
var breakable = buffer.readNullable(b -> TagKey.create(Registries.BLOCK, b.readResourceLocation()));
return new TurtleTool(id, adjective, craftingItem, toolItem, damageMultiplier, allowsEnchantments, consumesDurability, breakable);
return new TurtleTool(id, adjective, craftingItem, toolItem, damageMultiplier, allowsEnchantments, consumesDurability, breakable, peripheralType);
}
@Override
@ -67,6 +69,7 @@ public void toNetwork(FriendlyByteBuf buffer, TurtleTool upgrade) {
buffer.writeFloat(upgrade.damageMulitiplier);
buffer.writeBoolean(upgrade.allowEnchantments);
buffer.writeEnum(upgrade.consumeDurability);
buffer.writeUtf(upgrade.peripheralType);
buffer.writeNullable(upgrade.breakable, (b, x) -> b.writeResourceLocation(x.location()));
}
}

99
projects/common/src/test/java/dan200/computercraft/shared/turtle/upgrades/TurtleToolSerialiserTest.java
View File

@ -4,6 +4,18 @@
package dan200.computercraft.shared.turtle.upgrades;
import net.jqwik.api.Arbitraries;
import net.jqwik.api.Arbitrary;
import net.jqwik.api.Builders;
import net.jqwik.api.ForAll;
import net.jqwik.api.Property;
import net.jqwik.api.Provide;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block;
import dan200.computercraft.api.turtle.ITurtleUpgrade;
import dan200.computercraft.api.turtle.TurtleToolDurability;
import dan200.computercraft.test.core.StructuralEquality;
@ -11,8 +23,8 @@
import dan200.computercraft.test.shared.MinecraftEqualities;
import dan200.computercraft.test.shared.NetworkSupport;
import dan200.computercraft.test.shared.WithMinecraft;
import net.jqwik.api.*;
import net.minecraft.core.registries.Registries;
import javax.annotation.Nullable;
import static org.hamcrest.MatcherAssert.assertThat;
@ -22,6 +34,67 @@ class TurtleToolSerialiserTest {
WithMinecraft.Setup.bootstrap(); // @Property doesn't run test lifecycle methods.
}
static class TurtleToolBuilder {
ResourceLocation id;
String adjective;
Item craftItem;
ItemStack toolItem;
float damageMulitiplier;
boolean allowEnchantments;
TurtleToolDurability consumeDurability;
@Nullable TagKey<Block> breakable;
String peripheralType;
public TurtleToolBuilder withId(ResourceLocation id) {
this.id = id;
return this;
}
public TurtleToolBuilder withAdjective(String adjective) {
this.adjective = adjective;
return this;
}
public TurtleToolBuilder withCraftItem(Item craftItem) {
this.craftItem = craftItem;
return this;
}
public TurtleToolBuilder withToolItem(ItemStack toolItem) {
this.toolItem = toolItem;
return this;
}
public TurtleToolBuilder withDamageMultiplier(float damageMulitiplier) {
this.damageMulitiplier = damageMulitiplier;
return this;
}
public TurtleToolBuilder withAllowEnchantments(boolean allowEnchantments) {
this.allowEnchantments = allowEnchantments;
return this;
}
public TurtleToolBuilder withConsumeDurability(TurtleToolDurability consumeDurability) {
this.consumeDurability = consumeDurability;
return this;
}
public TurtleToolBuilder withBreakable(@Nullable TagKey<Block> breakable) {
this.breakable = breakable;
return this;
}
public TurtleToolBuilder withPeripheralType(String peripheralType) {
this.peripheralType = peripheralType;
return this;
}
public TurtleTool build() {
return new TurtleTool(id, adjective, craftItem, toolItem, damageMulitiplier, allowEnchantments, consumeDurability, breakable, peripheralType);
}
}
/**
* Sends turtle tools on a roundtrip, ensuring that their contents are reassembled on the other end.
*
@ -41,16 +114,18 @@ public void testRoundTrip(@ForAll("tool") TurtleTool tool) {
@Provide
Arbitrary<TurtleTool> tool() {
return Combinators.combine(
MinecraftArbitraries.resourceLocation(),
Arbitraries.strings().ofMaxLength(100),
MinecraftArbitraries.item(),
MinecraftArbitraries.itemStack(),
Arbitraries.floats(),
Arbitraries.of(true, false),
Arbitraries.of(TurtleToolDurability.values()),
MinecraftArbitraries.tagKey(Registries.BLOCK)
).as(TurtleTool::new);
return Builders.withBuilder(() -> new TurtleToolBuilder())
.use(MinecraftArbitraries.resourceLocation()).in((builder, resourceLocation) -> builder.withId(resourceLocation))
.use(Arbitraries.strings().ofMaxLength(100)).in((builder, adjective) -> builder.withAdjective(adjective))
.use(MinecraftArbitraries.item()).in((builder, craftItem) -> builder.withCraftItem(craftItem))
.use(MinecraftArbitraries.itemStack()).in((builder, toolItem) -> builder.withToolItem(toolItem))
.use(Arbitraries.floats()).in((builder, damageMulitiplier) -> builder.withDamageMultiplier(damageMulitiplier))
.use(Arbitraries.of(true, false)).in((builder, allowEnchantments) -> builder.withAllowEnchantments(allowEnchantments))
.use(Arbitraries.of(TurtleToolDurability.values())).in((builder, consumeDurability) -> builder.withConsumeDurability(consumeDurability))
.use(MinecraftArbitraries.tagKey(Registries.BLOCK)).in((builder, breakable) -> builder.withBreakable(breakable))
.use(Arbitraries.strings().ofMaxLength(100)).in((builder, peripheralType) -> builder.withPeripheralType(peripheralType))
.build(builder -> builder.build());
}
private static final StructuralEquality<TurtleTool> equality = StructuralEquality.all(

2
projects/forge/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_axe.json generated
View File

@ -1 +1 @@
{"type": "computercraft:tool", "damageMultiplier": 6.0, "item": "minecraft:diamond_axe"}
{"type": "computercraft:tool", "damageMultiplier": 6.0, "item": "minecraft:diamond_axe", "peripheralType": "axe"}

7
projects/forge/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_hoe.json generated
View File

@ -1 +1,6 @@
{"type": "computercraft:tool", "breakable": "computercraft:turtle_hoe_harvestable", "item": "minecraft:diamond_hoe"}
{
"type": "computercraft:tool",
"breakable": "computercraft:turtle_hoe_harvestable",
"item": "minecraft:diamond_hoe",
"peripheralType": "hoe"
}

2
projects/forge/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_pickaxe.json generated
View File

@ -1 +1 @@
{"type": "computercraft:tool", "item": "minecraft:diamond_pickaxe"}
{"type": "computercraft:tool", "item": "minecraft:diamond_pickaxe", "peripheralType": "pickaxe"}

3
projects/forge/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_shovel.json generated
View File

@ -1,5 +1,6 @@
{
"type": "computercraft:tool",
"breakable": "computercraft:turtle_shovel_harvestable",
"item": "minecraft:diamond_shovel"
"item": "minecraft:diamond_shovel",
"peripheralType": "shovel"
}

3
projects/forge/src/generated/resources/data/minecraft/computercraft/turtle_upgrades/diamond_sword.json generated
View File

@ -2,5 +2,6 @@
"type": "computercraft:tool",
"breakable": "computercraft:turtle_sword_harvestable",
"damageMultiplier": 9.0,
"item": "minecraft:diamond_sword"
"item": "minecraft:diamond_sword",
"peripheralType": "sword"
}