From 454d8530c370dae12a5edd0e383ae3afb25347fe Mon Sep 17 00:00:00 2001 From: Gugle Date: Thu, 19 Dec 2024 15:47:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BD=BF=E9=9B=86=E7=94=B5=E5=99=A8?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E7=94=B5=E7=BD=91=E5=88=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/api/power/IPowerComponent.java | 9 ++++++++- .../dubhe/anvilcraft/api/power/PowerGrid.java | 3 ++- .../anvilcraft/block/ChargeCollectorBlock.java | 6 +----- .../entity/ChargeCollectorBlockEntity.java | 17 +++++++---------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/dev/dubhe/anvilcraft/api/power/IPowerComponent.java b/src/main/java/dev/dubhe/anvilcraft/api/power/IPowerComponent.java index fbcbff5fe..095a23b96 100644 --- a/src/main/java/dev/dubhe/anvilcraft/api/power/IPowerComponent.java +++ b/src/main/java/dev/dubhe/anvilcraft/api/power/IPowerComponent.java @@ -16,7 +16,7 @@ * 电力元件 */ @SuppressWarnings("unused") -public interface IPowerComponent { +public interface IPowerComponent extends Comparable { BooleanProperty OVERLOAD = BooleanProperty.create("overload"); EnumProperty SWITCH = EnumProperty.create("switch", Switch.class); @@ -105,4 +105,11 @@ default void flushState(@NotNull Level level, @NotNull BlockPos pos) { level.setBlockAndUpdate(pos, state.setValue(OVERLOAD, true)); } } + + @Override + default int compareTo(@NotNull IPowerComponent iPowerComponent) { + if (this.equals(iPowerComponent)) return 0; + int i = getComponentType().compareTo(iPowerComponent.getComponentType()); + return i == 0 ? 1 : i; + } } diff --git a/src/main/java/dev/dubhe/anvilcraft/api/power/PowerGrid.java b/src/main/java/dev/dubhe/anvilcraft/api/power/PowerGrid.java index 30dff101a..6c2733244 100644 --- a/src/main/java/dev/dubhe/anvilcraft/api/power/PowerGrid.java +++ b/src/main/java/dev/dubhe/anvilcraft/api/power/PowerGrid.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import java.util.TreeSet; /** * 电网 @@ -134,7 +135,7 @@ protected void tick() { } private void gridTick() { - Set components = Collections.synchronizedSet(new HashSet<>()); + Set components = Collections.synchronizedSet(new TreeSet<>()); components.addAll(this.transmitters); components.addAll(this.consumers); components.addAll(this.storages); diff --git a/src/main/java/dev/dubhe/anvilcraft/block/ChargeCollectorBlock.java b/src/main/java/dev/dubhe/anvilcraft/block/ChargeCollectorBlock.java index 8c34f10cd..867609983 100644 --- a/src/main/java/dev/dubhe/anvilcraft/block/ChargeCollectorBlock.java +++ b/src/main/java/dev/dubhe/anvilcraft/block/ChargeCollectorBlock.java @@ -68,10 +68,6 @@ public BlockEntityTicker getTicker( (level1, blockPos, blockState, blockEntity) -> blockEntity.clientTick() ); } - return createTickerHelper( - type, - ModBlockEntities.CHARGE_COLLECTOR.get(), - (level1, blockPos, blockState, blockEntity) -> blockEntity.tick() - ); + return super.getTicker(level, state, type); } } diff --git a/src/main/java/dev/dubhe/anvilcraft/block/entity/ChargeCollectorBlockEntity.java b/src/main/java/dev/dubhe/anvilcraft/block/entity/ChargeCollectorBlockEntity.java index 04216d550..659811615 100644 --- a/src/main/java/dev/dubhe/anvilcraft/block/entity/ChargeCollectorBlockEntity.java +++ b/src/main/java/dev/dubhe/anvilcraft/block/entity/ChargeCollectorBlockEntity.java @@ -22,11 +22,10 @@ import org.jetbrains.annotations.Nullable; public class ChargeCollectorBlockEntity extends BlockEntity implements IPowerProducer, IHasAffectRange { - private static final double MAX_POWER_PER_INCOMING = 128; - private static final int COOLDOWN = 40; + private static final int COOLDOWN = 2; - private int cooldownCount = 40; + private int cooldownCount = 2; private double chargeCount = 0; private PowerGrid grid = null; private int power = 0; @@ -82,7 +81,7 @@ public int getOutputPower() { } @Override - public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { + public void loadAdditional(@NotNull CompoundTag tag, HolderLookup.@NotNull Provider registries) { super.loadAdditional(tag, registries); this.cooldownCount = tag.getInt("cooldownCount"); this.chargeCount = tag.getDouble("chargeCount"); @@ -90,18 +89,16 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) { } @Override - public void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) { + public void saveAdditional(@NotNull CompoundTag tag, HolderLookup.@NotNull Provider registries) { super.loadAdditional(tag, registries); tag.putInt("cooldownCount", this.cooldownCount); tag.putDouble("chargeCount", this.chargeCount); tag.putInt("power", this.power); } - /** - * 方块实体tick - */ - public void tick() { - if (this.cooldownCount > 1) { + @Override + public void gridTick() { + if (this.cooldownCount >= 1) { this.cooldownCount -= 1; return; } From 8e68a27a72358f3968d0462b55cce30eea271c3c Mon Sep 17 00:00:00 2001 From: XeKr <987820727@qq.com> Date: Thu, 19 Dec 2024 16:48:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=B5=E5=AE=B9=E5=99=A8=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=94=B5=E5=AE=B9=E5=99=A8=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anvilcraft/models/item/capacitor.json | 6 - .../models/item/capacitor_empty.json | 6 - .../models/block/capacitor_bank_0.json | 134 ---------- .../models/block/capacitor_bank_1.json | 134 ---------- .../models/block/capacitor_bank_2.json | 134 ---------- .../models/block/capacitor_bank_3.json | 134 ---------- .../models/block/capacitor_bank_4.json | 134 ---------- .../models/block/capacitor_bank_5.json | 134 ---------- .../models/block/capacitor_bank_6.json | 134 ---------- .../models/block/capacitor_bank_7.json | 134 ---------- .../models/block/capacitor_bank_8.json | 134 ---------- .../models/block/capacitor_bank_9.json | 134 ---------- .../anvilcraft/models/item/capacitor.json | 79 ++++++ .../models/item/capacitor_empty.json | 7 + .../models/item/supercapacitor.json | 250 ++++++++++++++++++ .../models/item/supercapacitor_empty.json | 184 +++++++++++++ .../anvilcraft/textures/item/capacitor.png | Bin 296 -> 234 bytes .../textures/item/capacitor_empty.png | Bin 260 -> 234 bytes .../textures/item/supercapacitor.png | Bin 0 -> 307 bytes .../textures/item/supercapacitor_electric.png | Bin 0 -> 4415 bytes .../item/supercapacitor_electric.png.mcmeta | 6 + .../textures/item/supercapacitor_empty.png | Bin 0 -> 307 bytes 22 files changed, 526 insertions(+), 1352 deletions(-) delete mode 100644 src/generated/resources/assets/anvilcraft/models/item/capacitor.json delete mode 100644 src/generated/resources/assets/anvilcraft/models/item/capacitor_empty.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_0.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_1.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_2.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_3.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_4.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_5.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_6.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_7.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_8.json delete mode 100644 src/main/resources/assets/anvilcraft/models/block/capacitor_bank_9.json create mode 100644 src/main/resources/assets/anvilcraft/models/item/capacitor.json create mode 100644 src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json create mode 100644 src/main/resources/assets/anvilcraft/models/item/supercapacitor.json create mode 100644 src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json create mode 100644 src/main/resources/assets/anvilcraft/textures/item/supercapacitor.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/supercapacitor_electric.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/supercapacitor_electric.png.mcmeta create mode 100644 src/main/resources/assets/anvilcraft/textures/item/supercapacitor_empty.png diff --git a/src/generated/resources/assets/anvilcraft/models/item/capacitor.json b/src/generated/resources/assets/anvilcraft/models/item/capacitor.json deleted file mode 100644 index 2c835c265..000000000 --- a/src/generated/resources/assets/anvilcraft/models/item/capacitor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/capacitor" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/anvilcraft/models/item/capacitor_empty.json b/src/generated/resources/assets/anvilcraft/models/item/capacitor_empty.json deleted file mode 100644 index 918a2326f..000000000 --- a/src/generated/resources/assets/anvilcraft/models/item/capacitor_empty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/capacitor_empty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_0.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_0.json deleted file mode 100644 index 2de6eaa2e..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_0.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_1.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_1.json deleted file mode 100644 index e115df5c0..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_1.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_2.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_2.json deleted file mode 100644 index fa4166674..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_2.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_3.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_3.json deleted file mode 100644 index df87d482d..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_3.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_4.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_4.json deleted file mode 100644 index 6c1925627..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_4.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_5.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_5.json deleted file mode 100644 index 6361c991e..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_5.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_6.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_6.json deleted file mode 100644 index cebb44e50..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_6.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_7.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_7.json deleted file mode 100644 index 4fc0a5917..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_7.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_8.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_8.json deleted file mode 100644 index 4ae485a6e..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_8.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "east": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "south": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "west": {"uv": [1, 0, 5, 14], "texture": "#base"}, - "up": {"uv": [6, 5, 10, 9], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_9.json b/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_9.json deleted file mode 100644 index 405256691..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/capacitor_bank_9.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "credit": "Made by XeKr with Blockbench", - "parent": "minecraft:block/block", - "textures": { - "particle": "anvilcraft:block/capacitor_bank", - "base": "anvilcraft:block/capacitor_bank", - "top": "anvilcraft:block/capacitor_bank_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [11, 2, 1], - "to": [15, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 1], - "to": [10, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 1], - "to": [5, 16, 5], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 6], - "to": [5, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 6], - "to": [10, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 6], - "to": [15, 16, 10], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [1, 2, 11], - "to": [5, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [6, 2, 11], - "to": [10, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [11, 2, 11], - "to": [15, 16, 15], - "faces": { - "north": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "east": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "south": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "west": {"uv": [11, 0, 15, 14], "texture": "#base"}, - "up": {"uv": [6, 9, 10, 13], "texture": "#base"} - } - }, - { - "from": [0, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "east": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "south": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "west": {"uv": [0, 2, 16, 4], "texture": "#base"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/capacitor.json b/src/main/resources/assets/anvilcraft/models/item/capacitor.json new file mode 100644 index 000000000..66410a041 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/item/capacitor.json @@ -0,0 +1,79 @@ +{ + "credit": "Made by XeKr with Blockbench", + "textures": { + "0": "anvilcraft:item/capacitor", + "particle": "anvilcraft:item/capacitor" + }, + "elements": [ + { + "from": [4.5, 1, 4.5], + "to": [11.5, 3, 11.5], + "faces": { + "north": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "up": {"uv": [9, 9, 16, 16], "texture": "#0"}, + "down": {"uv": [9, 9, 16, 16], "texture": "#0"} + } + }, + { + "from": [5.5, 3, 5.5], + "to": [10.5, 13, 10.5], + "faces": { + "north": {"uv": [1, 4, 6, 14], "texture": "#0"}, + "east": {"uv": [1, 4, 6, 14], "texture": "#0"}, + "south": {"uv": [1, 4, 6, 14], "texture": "#0"}, + "west": {"uv": [1, 4, 6, 14], "texture": "#0"} + } + }, + { + "from": [4.5, 13, 4.5], + "to": [11.5, 15, 11.5], + "faces": { + "north": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "east": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "west": {"uv": [0, 14, 7, 16], "texture": "#0"}, + "up": {"uv": [9, 9, 16, 16], "texture": "#0"}, + "down": {"uv": [9, 9, 16, 16], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.5, 2.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [1.5, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.8, 0.8, 0.8] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 0] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json b/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json new file mode 100644 index 000000000..ac2f18cf8 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/item/capacitor_empty.json @@ -0,0 +1,7 @@ +{ + "parent": "anvilcraft:item/capacitor", + "textures": { + "0": "anvilcraft:item/capacitor_empty", + "particle": "anvilcraft:item/capacitor_empty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/supercapacitor.json b/src/main/resources/assets/anvilcraft/models/item/supercapacitor.json new file mode 100644 index 000000000..ca8dbb249 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/item/supercapacitor.json @@ -0,0 +1,250 @@ +{ + "credit": "Made by XeKr with Blockbench", + "textures": { + "0": "anvilcraft:item/supercapacitor", + "1": "anvilcraft:item/supercapacitor_electric", + "particle": "anvilcraft:item/supercapacitor" + }, + "elements": [ + { + "from": [6, 9, 6], + "to": [10, 13, 10], + "faces": { + "north": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0"} + } + }, + { + "from": [6.5, 5, 7], + "to": [9.5, 9, 9], + "faces": { + "north": {"uv": [8, 4, 11, 8], "texture": "#0"}, + "east": {"uv": [11, 4, 13, 8], "texture": "#0"}, + "south": {"uv": [10, 4, 13, 8], "texture": "#0"}, + "west": {"uv": [9, 4, 11, 8], "texture": "#0"}, + "up": {"uv": [8, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [8, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [8.2, 3, 5.8], + "to": [10.2, 6, 7.8], + "faces": { + "north": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 7], "texture": "#0"}, + "south": {"uv": [13, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "up": {"uv": [11, 4, 13, 6], "texture": "#0"}, + "down": {"uv": [11, 6, 13, 8], "texture": "#0"} + } + }, + { + "from": [5.8, 3, 5.8], + "to": [7.8, 6, 7.8], + "faces": { + "north": {"uv": [9, 4, 11, 7], "texture": "#0"}, + "east": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "south": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "west": {"uv": [10, 4, 12, 7], "texture": "#0"}, + "up": {"uv": [9, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [9, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [5.8, 3, 8.2], + "to": [7.8, 6, 10.2], + "faces": { + "north": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 7], "texture": "#0"}, + "south": {"uv": [13, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "up": {"uv": [11, 4, 13, 6], "texture": "#0"}, + "down": {"uv": [11, 6, 13, 8], "texture": "#0"} + } + }, + { + "from": [8.2, 3, 8.2], + "to": [10.2, 6, 10.2], + "faces": { + "north": {"uv": [9, 4, 11, 7], "texture": "#0"}, + "east": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "south": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "west": {"uv": [10, 4, 12, 7], "texture": "#0"}, + "up": {"uv": [9, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [9, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [4, 0, 4], + "to": [12, 2, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [10.7, 13.7, 10.7], + "to": [5.3, 2.3, 5.3], + "shade": false, + "faces": { + "north": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "east": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "south": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "west": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "up": {"uv": [3, 6, 2, 7], "texture": "#0"}, + "down": {"uv": [3, 6, 2, 7], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [10.3, 13.3, 10.3], + "to": [5.7, 2.7, 5.7], + "shade": false, + "faces": { + "north": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "east": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "south": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "west": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "up": {"uv": [6, 3, 5, 4], "texture": "#0"}, + "down": {"uv": [6, 3, 5, 4], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [11, 14, 11], + "to": [5, 2, 5], + "shade": false, + "faces": { + "north": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "east": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "south": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "west": {"uv": [2, 4, 3, 3], "texture": "#0"} + } + }, + { + "from": [4, 14, 4], + "to": [12, 16, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#0"} + } + }, + { + "name": "cube_outline inverted", + "from": [5.6, 2.8, 8], + "to": [8, 6.2, 10.4], + "faces": { + "north": {"uv": [1, 10, 3, 7], "rotation": 180, "texture": "#1"}, + "east": {"uv": [6, 7, 8, 4], "rotation": 180, "texture": "#1"}, + "south": {"uv": [5, 11, 7, 8], "rotation": 180, "texture": "#1"}, + "west": {"uv": [3, 16, 5, 13], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "cube_outline inverted", + "from": [8, 2.8, 8], + "to": [10.4, 6.2, 10.4], + "faces": { + "north": {"uv": [1, 13, 3, 10], "rotation": 180, "texture": "#1"}, + "east": {"uv": [4, 15, 6, 12], "rotation": 180, "texture": "#1"}, + "south": {"uv": [5, 8, 7, 5], "rotation": 180, "texture": "#1"}, + "west": {"uv": [2, 8, 4, 5], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "cube_outline inverted", + "from": [5.6, 2.8, 5.6], + "to": [8, 6.2, 8], + "faces": { + "north": {"uv": [1, 13, 3, 10], "rotation": 180, "texture": "#1"}, + "east": {"uv": [5, 7, 7, 4], "rotation": 180, "texture": "#1"}, + "south": {"uv": [5, 15, 7, 12], "rotation": 180, "texture": "#1"}, + "west": {"uv": [1, 7, 3, 4], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "cube_outline inverted", + "from": [8, 2.8, 5.6], + "to": [10.4, 6.2, 8], + "faces": { + "north": {"uv": [1, 7, 3, 4], "rotation": 180, "texture": "#1"}, + "east": {"uv": [6, 7, 8, 4], "rotation": 180, "texture": "#1"}, + "south": {"uv": [5, 11, 7, 8], "rotation": 180, "texture": "#1"}, + "west": {"uv": [1, 14, 3, 11], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "cube_outline inverted", + "from": [6.3, 4.8, 6.8], + "to": [9.7, 9.2, 9.2], + "faces": { + "north": {"uv": [0, 15, 3, 11], "rotation": 180, "texture": "#1"}, + "east": {"uv": [5, 9, 7, 5], "rotation": 180, "texture": "#1"}, + "south": {"uv": [1, 10, 4, 6], "rotation": 180, "texture": "#1"}, + "west": {"uv": [4, 15, 6, 11], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "cube_outline inverted", + "from": [5.8, 8.8, 5.8], + "to": [10.2, 13.2, 10.2], + "faces": { + "north": {"uv": [1, 5, 5, 1], "rotation": 180, "texture": "#1"}, + "east": {"uv": [3, 14, 7, 10], "rotation": 180, "texture": "#1"}, + "south": {"uv": [1, 10, 5, 6], "rotation": 180, "texture": "#1"}, + "west": {"uv": [4, 8, 8, 4], "rotation": 180, "texture": "#1"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.5, 2.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [1.5, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.8, 0.8, 0.8] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 0] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json b/src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json new file mode 100644 index 000000000..7f2c3e5ef --- /dev/null +++ b/src/main/resources/assets/anvilcraft/models/item/supercapacitor_empty.json @@ -0,0 +1,184 @@ +{ + "credit": "Made by XeKr with Blockbench", + "ambientocclusion": false, + "textures": { + "0": "anvilcraft:item/supercapacitor_empty", + "particle": "anvilcraft:item/supercapacitor_empty" + }, + "elements": [ + { + "from": [6, 9, 6], + "to": [10, 13, 10], + "faces": { + "north": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "east": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "south": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "west": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "up": {"uv": [12, 0, 16, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0"} + } + }, + { + "from": [6.5, 5, 7], + "to": [9.5, 9, 9], + "faces": { + "north": {"uv": [8, 4, 11, 8], "texture": "#0"}, + "east": {"uv": [11, 4, 13, 8], "texture": "#0"}, + "south": {"uv": [10, 4, 13, 8], "texture": "#0"}, + "west": {"uv": [9, 4, 11, 8], "texture": "#0"}, + "up": {"uv": [8, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [8, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [8.2, 3, 5.8], + "to": [10.2, 6, 7.8], + "faces": { + "north": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 7], "texture": "#0"}, + "south": {"uv": [13, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "up": {"uv": [11, 4, 13, 6], "texture": "#0"}, + "down": {"uv": [11, 6, 13, 8], "texture": "#0"} + } + }, + { + "from": [5.8, 3, 5.8], + "to": [7.8, 6, 7.8], + "faces": { + "north": {"uv": [9, 4, 11, 7], "texture": "#0"}, + "east": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "south": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "west": {"uv": [10, 4, 12, 7], "texture": "#0"}, + "up": {"uv": [9, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [9, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [5.8, 3, 8.2], + "to": [7.8, 6, 10.2], + "faces": { + "north": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "east": {"uv": [14, 4, 16, 7], "texture": "#0"}, + "south": {"uv": [13, 4, 15, 7], "texture": "#0"}, + "west": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "up": {"uv": [11, 4, 13, 6], "texture": "#0"}, + "down": {"uv": [11, 6, 13, 8], "texture": "#0"} + } + }, + { + "from": [8.2, 3, 8.2], + "to": [10.2, 6, 10.2], + "faces": { + "north": {"uv": [9, 4, 11, 7], "texture": "#0"}, + "east": {"uv": [12, 4, 14, 7], "texture": "#0"}, + "south": {"uv": [11, 4, 13, 7], "texture": "#0"}, + "west": {"uv": [10, 4, 12, 7], "texture": "#0"}, + "up": {"uv": [9, 4, 11, 6], "texture": "#0"}, + "down": {"uv": [9, 6, 11, 8], "texture": "#0"} + } + }, + { + "from": [4, 0, 4], + "to": [12, 2, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 16], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [10.7, 13.7, 10.7], + "to": [5.3, 2.3, 5.3], + "shade": false, + "faces": { + "north": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "east": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "south": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "west": {"uv": [2, 7, 3, 6], "texture": "#0"}, + "up": {"uv": [3, 6, 2, 7], "texture": "#0"}, + "down": {"uv": [3, 6, 2, 7], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [10.3, 13.3, 10.3], + "to": [5.7, 2.7, 5.7], + "shade": false, + "faces": { + "north": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "east": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "south": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "west": {"uv": [5, 4, 6, 3], "texture": "#0"}, + "up": {"uv": [6, 3, 5, 4], "texture": "#0"}, + "down": {"uv": [6, 3, 5, 4], "texture": "#0"} + } + }, + { + "name": "cube inverted", + "from": [11, 14, 11], + "to": [5, 2, 5], + "shade": false, + "faces": { + "north": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "east": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "south": {"uv": [2, 4, 3, 3], "texture": "#0"}, + "west": {"uv": [2, 4, 3, 3], "texture": "#0"} + } + }, + { + "from": [4, 14, 4], + "to": [12, 16, 12], + "shade": false, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 8, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [1.5, 2.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [1.5, 2.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.8, 0.8, 0.8] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 0] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/textures/item/capacitor.png b/src/main/resources/assets/anvilcraft/textures/item/capacitor.png index ad1edb7bbbb46db03859546feb57efd3aa54464b..1fca962d9824efb98397fc990ce8ccfb2b2b01fb 100644 GIT binary patch delta 169 zcmZ3%^ontUXT3y#Pl&6biDhU+l#82ZW>)6%2X|w4Y^^zaih+UQCijt>K#HRz$S?Rm z1Tfrd-Wv%N3-NSu45_%4)9)yBz<`4(wB_IbEp74+?>8_qjhH%B&%>v>y1M46I0E6ng7;rEL z?BO}4cKHAQsMSV2)r-`v1`9_CU-{SICi#?^$sudnHugX~OIKJ_MpjXofq{YXbM##x#ZeOE7yKUr z816OijRcB?c)B=-RNTtxcN98cz`+#S^6&p~S!++9TSYN~SJq8`!+eOb!ej$S|AySw zrMAtJ_!eAZH2TaC`HOk+{_r^>FJ-y3TuXH2w3U8scp0((OwZTTGwv|)FetoW&APCB Rh8fTT22WQ%mvv4FO#lt#LWBSS delta 195 zcmaFG*upfyvtBO1C&V=}I;Oh1+Q7&(Ju}1H(#FRxKtoGUSyj{C(S?D5Ve7QEhd_#} zB*-uLKMXKzI-_$QD4OQ!;uunKE94wE*AW8_mVo+T_3!&X%vx)j>rf!)6L9VCy4B(@ zU))oXZCq62z_@u46V4 qyhB@l-`NEX>4Tx0C?J+Q+HUC_ZB|i_hk=OLfG)Jmu!ImA|tE_$Pihg5Rw34gb)%y#f69p zRumNxoJdu~g4GI0orvO~D7a@qiilc^Ra`jkAKa(4eR}Wh?fcjJyyu+f{LXpL4}cL8 zCXwc%Y5+M>g*-agACFH+#L2yY0u@N$1RxOR%fe>`#Q*^C19^CUbg)1C0k3ZW0swH; zE+i7i;s1lWP$pLZAdvvzA`<5d0gzGv$SzdK6adH=0I*ZDWC{S3003-xd_p1ssto|_ z^hrJi0NAOM+!p}Yq8zCR0F40vnJ7mj0zkU}U{!%qECRs70HCZuA}$2Lt^t5qwlYTo zfV~9(c8*w(4?ti5fSE!p%m5%b0suoE6U_r4Oaq`W(!b!TUvP!ENC5!A%azTSOVTqG zxRuZvck=My;vwR~Y_URN7by^C3FIQ2mzyIKNaq7g&I|wm8u`(|{y0C7=jP<$=4R(? z@ASo@{%i1WB0eGU-~POe0t5gMPS5Y!U*+Z218~Oyuywy{sapWrRsd+<`CT*H37}dE z(0cicc{uz)9-g64$UGe!3JVMEC1RnyFyo6p|1;rl;ER6t{6HT5+j{T-ahgDxt-zy$ z{c&M#cCJ#6=gR~_F>d$gBmT#QfBlXr(c(0*Tr3re@mPttP$EsodAU-NL?OwQ;u7h9 zGVvdl{RxwI4FIf$Pry#L2er#=z<%xl0*ek<(slqqe)BDi8VivC5N9+pdG`PSlfU_o zKq~;2Moa!tiTSO!5zH77Xo1hL_iEAz&sE_ z2IPPo3ZWR5K^auQI@koYumc*P5t`u;w81er4d>tzT!HIw7Y1M$p28Tsh6w~g$Osc* zAv%Z=Vvg7%&IlKojszlMNHmgwq#)^t6j36@$a16tsX}UzT}UJHEpik&ja)$bklV;0 zGK&0)yhkyVfwEBp)B<%txu_o+ipHRG(R4HqU4WLNYtb6C9zB4zqNmYI=yh}eeTt4_ zfYC7yW{lZkT#ScBV2M~7CdU?I?5=ix(HVZgM=}{CnA%mPqZa^68Xe5gFH?u96Et<2 zCC!@_L(8Nsqt(!wX=iEoXfNq>x(VHb9z~bXm(pwK2kGbOgYq4YG!XMxcgB zqf}$J#u<$v7REAV@mNCEa#jQDENhreVq3EL>`ZnA`x|yIdrVV9bE;;nW|3x{=5fsd z4#u(I@HyF>O3oq94bFQl11&!-vDRv>X03j$H`;pIzS?5#a_tuF>)P*iaGgM%ES>c_ zZ94aL3A#4AQM!e?+jYlFJ5+DSzi0S9#6BJCZ5(XZOGfi zTj0IRdtf>~J!SgN=>tB-J_4V5pNGDtz9Qc}z9W9tewls;{GR(e`pf-~_`l(K@)q$< z1z-We0p$U`ff|9c18V~x1epY-2Q>wa1-k|>3_cY?3<(WcA99m#z!&lx`C~KOXDpi0 z70L*m6G6C?@k ziR8rC#65}Qa{}jVnlqf_npBo_W3J`gqPZ95>CVfZcRX1&S&)1jiOPpx423?lIEROmG(H@JAFg?XogQlb;dIZPf{y+kr|S? zBlAsGMAqJ{&)IR=Ejg5&l$@hd4QZCNE7vf$D7Q~$D=U)?Nn}(WA6du22pZOfRS_cv~1-c(_QtNLti0-)8>m`6CO07JR*suu!$(^sg%jf zZm#rNxnmV!m1I@#YM0epR(~oNm0zrItf;Q|utvD%;#W>z)qM4NZQ9!2O1H}G>qzUQ z>u#*~S--DJy=p<#(1!30tsC);y-IHSJr>wyfLop*ExT zdYyk=%U1oZtGB+{Cfe4&-FJKQ4uc&PJKpb5^_C@dOYIJXG+^@gCvI%WcHjN%gI&kHifN$EH?V5MBa9S!3!a?Q1 zC*P)gd*e{(q0YnH!_D8Bf4B7r>qvPk(mKC&tSzH$pgp0z@92!9ogH2sN4~fJe(y2k zV|B+hk5`_cohUu=`Q(C=R&z?UQbnZ;IU-!xL z-sg{9@Vs#JBKKn3CAUkhJ+3`ResKNaNUvLO>t*-L?N>ambo5Q@JJIjcfBI^`)pOVQ z*DhV3dA;w(>>IakCfyvkCA#(acJ}QTcM9%I++BK)c(44v+WqPW`VZ=VwEnSWz-{38 zV8CF{!&wjS4he^z{*?dIhvCvk%tzHDMk9@nogW_?4H~`jWX_Y}r?RIL&&qyQ|9R_k ztLNYS;`>X_Sp3-V3;B!BzpiYZPMaY+G1Pi z;56f1=XMWghAE0CnVfsixo1Dt-g})r6p2LW?b?lud7|Il_7i@5w*&Eeo|C7)=Z@dH zsryPJy;1WalQG`ewn@Loug8pgHTez~d!Xcr@bI8ZfUaxh-r{b)^nlB7zan6j=s5@{4CgZv0%}=A)cxr23 zrJ{K*c+E{Nn0Ut8)gdCd0}Hg-j%N674&S&Wjt3LMU?T8w%#WJ=-Ve<@cjiL!-1tKm zm$pC$ybmH8e8F{hf^()Qt2juHXNaYgJwqrA_sdw{U^2 zRzK!f&<3-PHk@F8YCfkX2UK6vK2=^`!GBvx_T~0d_J}8)CubH=Z+L|B^NQ?A;p?`~ z3<-cUBZ1_pKeAsU6#cFsyObTvoDloT0=ftlfCQib@|EY;>iCN=_zLU#I#1|y$C}JK zjM$WVkUB7}!T>hYlif9h5JI6K>H-c!LtUq<)yxHa>}YgA%%vZXd_&_Yuff&j4DC|$ znBmIqmfNNyBYUni^Pks({N&aUh|r&s#;EM?Ps|6LIZDE@u)f<^eOm1G%27m0{JTJMCZb}qe_Pn zX6-s~&<;$`Q(&A+9p~xWV`m6Far$BxBb+yT+o?M|YJ&$}Ub#x$x^Y$Wginx02=RRK zQZpyt{ENIdKmLYmE7-+D@HJdn?)CLkUuRX74 zRw1{ZZBb`iyT}TMRZejg<7Nu?b=VP~PnWbP*jVkBJ<1ru%4g>(3tA8|-1+!{Twor+ zim!u2&4*8#hrI`O&@;=|YLrJKw=b4W)n#%pMt~HRCEy_`2HIUdG_@cq-~nN7;Q_(H zQ_C-o2YedEYcSircpkuw2Fs%spf9MYd7tnD4?q*HIV4Xa9uRyqh(I0}rfee4sC~3C za^b)l2-5dxNv;MR%C!q=MN0^bgnpnf^FES(L8wf3s6)i)2TW>%RThxe73MGwnu+?B zZltcRJ{&}cie@7_5YS|cmJoC&Kt`J^_^RpM;eibmehnbjbelK+98ato18JM$ z1!g4VHWE;yw0^f?)`3YX(l2;ZbMtg=&!3&6KgMhpSA@oFTyOZ9X`P-Hupi9Mu`N?u zqI{Pt9(%Hnb@0TTsX@0tkgSuB6a8<%p6rYNc>YI#0RWZBAKo^jYx4jA002ovPDHLk FV1n`rKgKyNX4z1zCgai z1{}_r%)9~$d;e#;Z(26hD)Wzmy`;22zl?ZFuv_pA*E_Cd0d0*B-t66e&F{9E_vE_{ zj3%b`eG?63mri+U;CgssVPj5$=@sb&GXv>Ezmju5*d3p{B220MM-#`Y Date: Fri, 20 Dec 2024 04:28:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=84=E9=AD=94?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/assets/anvilcraft/lang/en_ud.json | 3 +++ .../resources/assets/anvilcraft/lang/en_us.json | 3 +++ .../data/lang/EnchantmentDescriptionsLang.java | 15 +++++++++++++++ .../dubhe/anvilcraft/data/lang/LangHandler.java | 1 + .../java/dev/dubhe/anvilcraft/init/ModItems.java | 4 ++++ 5 files changed, 26 insertions(+) create mode 100644 src/main/java/dev/dubhe/anvilcraft/data/lang/EnchantmentDescriptionsLang.java diff --git a/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/src/generated/resources/assets/anvilcraft/lang/en_ud.json index 2623c5958..2d0263b38 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_ud.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "ɹǝsɐן ʎq pǝɔɹǝıd sɐʍ %1$s", "death.attack.anvilcraft.lost_in_time": "ǝɯıʇ ɟo ɹǝʌıɹ ǝɥʇ uı ʇsoן sɐʍ %1$s", "enchantment.anvilcraft.beheading": "buıpɐǝɥǝᗺ", + "enchantment.anvilcraft.beheading.desc": "˙os op oʇ spɐǝɥ ɹıǝɥʇ doɹp oʇ ǝןqɐun ʎןsnoıʌǝɹd ǝɹǝʍ ʇɐɥʇ )sɹǝʎɐןd buıpnןɔuı( sqoɯ ǝsnɐɔ puɐ buıddoɹp ןןnʞS uoʇǝןǝʞS ɹǝɥʇıM ǝɥʇ ɟo ʎʇıןıqɐqoɹd ǝɥʇ ǝɔuɐɥuƎ", "enchantment.anvilcraft.felling": "buıןןǝℲ", + "enchantment.anvilcraft.felling.desc": "˙ןǝʌǝן ɹǝd ǝןɔɹıɔ ǝuo buıpuɐdxǝ 'ㄥ * ㄥ sı ןǝʌǝן pɹıɥʇ ǝɥʇ puɐ 'ϛ * ϛ sı ןǝʌǝן puoɔǝs ǝɥʇ 'Ɛ * Ɛ sı ǝbuɐɹ ןǝʌǝן ʇsɹıɟ ǝɥ⟘ ˙ɯǝɥʇ ʇuɐןdǝɹ puɐ ǝbuɐɹ uıɐʇɹǝɔ ɐ uıɥʇıʍ sdoɹɔ ǝɹnʇɐɯ ʇsǝʌɹɐH", "enchantment.anvilcraft.harvest": "ʇsǝʌɹɐH", + "enchantment.anvilcraft.harvest.desc": "˙ǝɯıʇ ɐ ʇɐ sʞɔoןq uᄅ+Ɩ oʇ dn ʇɔǝןןoɔ uıɐɥɔ uɐɔ 'u ןǝʌǝן ʇuǝɯʇuɐɥɔuǝ ɟo uoıʇɐɹnbıɟuoɔ ʇןnɐɟǝp ɐ ɥʇıʍ 'sʇuɐıɹɐʌ ɹıǝɥʇ puɐ sboן ɟo uoıʇɔǝןןoɔ uıɐɥƆ", "entity.anvilcraft.animate_ascending_block": "ʞɔoןᗺ buıpuǝɔsⱯ ǝʇɐɯıuⱯ", "entity.anvilcraft.falling_giant_anvil": "ןıʌuⱯ ʇuɐı⅁ buıןןɐℲ", "entity.anvilcraft.falling_spectral_block": "ʞɔoןᗺ ןɐɹʇɔǝdS buıןןɐℲ", diff --git a/src/generated/resources/assets/anvilcraft/lang/en_us.json b/src/generated/resources/assets/anvilcraft/lang/en_us.json index 306d43613..cba5639d8 100644 --- a/src/generated/resources/assets/anvilcraft/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft/lang/en_us.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "Animate Ascending Block", "entity.anvilcraft.falling_giant_anvil": "Falling Giant Anvil", "entity.anvilcraft.falling_spectral_block": "Falling Spectral Block", diff --git a/src/main/java/dev/dubhe/anvilcraft/data/lang/EnchantmentDescriptionsLang.java b/src/main/java/dev/dubhe/anvilcraft/data/lang/EnchantmentDescriptionsLang.java new file mode 100644 index 000000000..6ace63f01 --- /dev/null +++ b/src/main/java/dev/dubhe/anvilcraft/data/lang/EnchantmentDescriptionsLang.java @@ -0,0 +1,15 @@ +package dev.dubhe.anvilcraft.data.lang; + +import com.tterrag.registrate.providers.RegistrateLangProvider; +import org.jetbrains.annotations.NotNull; + +public class EnchantmentDescriptionsLang { + /** + * @param provider 提供器 + */ + public static void init(@NotNull RegistrateLangProvider provider) { + provider.add("enchantment.anvilcraft.harvest.desc", "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time."); + provider.add("enchantment.anvilcraft.felling.desc", "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level."); + provider.add("enchantment.anvilcraft.beheading.desc", "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so."); + } +} diff --git a/src/main/java/dev/dubhe/anvilcraft/data/lang/LangHandler.java b/src/main/java/dev/dubhe/anvilcraft/data/lang/LangHandler.java index 9fe48611b..61da3836a 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/lang/LangHandler.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/lang/LangHandler.java @@ -18,5 +18,6 @@ public static void init(RegistrateLangProvider provider) { PatchouliLang.init(provider); ScreenLang.init(provider); JeiLang.init(provider); + EnchantmentDescriptionsLang.init(provider); } } diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 8e8b30daa..c776c0622 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -420,10 +420,14 @@ public class ModItems { .register(); public static final ItemEntry CAPACITOR = REGISTRATE .item("capacitor", CapacitorItem::new) + .model((ctx, provider) -> { + }) .tag(ModItemTags.CAPACITOR) .register(); public static final ItemEntry CAPACITOR_EMPTY = REGISTRATE .item("capacitor_empty", EmptyCapacitorItem::new) + .model((ctx, provider) -> { + }) .tag(ModItemTags.CAPACITOR) .register(); public static final ItemEntry CHOCOLATE = REGISTRATE From 1d72172ae5b600fe441a71bf1ff595df7fca98ee Mon Sep 17 00:00:00 2001 From: Gugle Date: Fri, 20 Dec 2024 07:01:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A5=B0=E5=93=81?= =?UTF-8?q?=E6=A8=A1=E7=BB=84=EF=BC=88Adorned/Curios=20Compat=20Layer=20fo?= =?UTF-8?q?r=20Accessories/Curios=20API=20Continuation=EF=BC=89=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 16 +++- gradle/libs.versions.toml | 4 + gradle/scripts/repositories.gradle | 46 +++++++--- .../data/c/tags/item/tools/wrench.json | 3 +- .../GuiLayerRegistrationEventListener.java | 2 +- .../client/event/RenderEventListener.java | 12 +-- .../anvilcraft/data/tags/ItemTagLoader.java | 3 +- .../integration/curios/CuriosIntegration.java | 59 +++++++++++++ .../integration/curios/GogglesCurioItem.java | 23 +++++ .../curios/GogglesCurioRenderer.java | 85 +++++++++++++++++++ .../anvilcraft/item/IEngineerGoggles.java | 23 ++++- .../resources/META-INF/neoforge.mods.toml | 3 + .../anvilcraft/curios/entities/player.json | 9 ++ .../resources/data/curios/tags/item/head.json | 8 ++ 14 files changed, 266 insertions(+), 30 deletions(-) create mode 100644 src/main/java/dev/dubhe/anvilcraft/integration/curios/CuriosIntegration.java create mode 100644 src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioItem.java create mode 100644 src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioRenderer.java create mode 100644 src/main/resources/data/anvilcraft/curios/entities/player.json create mode 100644 src/main/resources/data/curios/tags/item/head.json diff --git a/dependencies.gradle b/dependencies.gradle index b2a16869e..5e80803ef 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,18 @@ dependencies { + // Registrate api("com.tterrag.registrate:Registrate:${libs.versions.registrate.get()}") jarJar("com.tterrag.registrate:Registrate:${libs.versions.registrate.get()}") + // Anvil Lib + implementation(libs.anvillib) + jarJar(libs.anvillib) + + // Cloth Config implementation(libs.clothConfig) + jarJar(libs.clothConfig) + + // Curios API + implementation(libs.curios) // JEI compileOnlyApi(libs.jeiCommonApi) { transitive = false } @@ -22,15 +32,13 @@ dependencies { compileOnlyApi("vazkii.patchouli:Patchouli:${libs.versions.patchouli.get()}:api") runtimeOnly(libs.patchouli) + // Sodium, Iris, Embeddium compileOnly("maven.modrinth:sodium:mc1.21.1-0.6.3-neoforge") compileOnly("maven.modrinth:embeddium:1.0.11+mc1.21.1") compileOnly("maven.modrinth:iris:1.8.1+1.21.1-neoforge") + // Jade, The One Probe, KubeJS implementation(libs.jade) implementation(libs.theoneprobe) implementation(libs.kubejs) } - -// compileOnly("maven.modrinth:sodium:mc1.21.1-0.6.0-beta.4-neoforge") -// compileOnly("maven.modrinth:iris:1.8.0-beta.5+1.21-neoforge") -// compileOnly("maven.modrinth:embeddium:1.0.11+mc1.21.1") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c46b1d1c1..290ddcad6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,8 @@ modDevGradle = "2.0.34-beta" spotless = "7.0.0.BETA2" lombok = "8.7.1" machete = "1.+" +anvillib = "1.1.0+build.97" +curios = "9.0.15+1.21.1" [libraries] neoForge = { group = "net.neoforged", name = "neoforge", version.ref = "neoForge" } @@ -31,6 +33,8 @@ jade = { group = "maven.modrinth", name = "jade", version.ref = "jade" } theoneprobe = { group = "mcjty.theoneprobe", name = "theoneprobe", version.ref = "theoneprobe" } kubejs = { group = "dev.latvian.mods", name = "kubejs-neoforge", version.ref = "kubejs" } patchouli = { group = "vazkii.patchouli", name = "Patchouli", version.ref = "patchouli" } +anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" } +curios = { group = "top.theillusivec4.curios", name = "curios-neoforge", version.ref = "curios" } [plugins] diff --git a/gradle/scripts/repositories.gradle b/gradle/scripts/repositories.gradle index 46f4b838b..795175aaa 100644 --- a/gradle/scripts/repositories.gradle +++ b/gradle/scripts/repositories.gradle @@ -1,27 +1,42 @@ repositories { mavenLocal() mavenCentral() - maven { url = "https://server.cjsah.net:1002/maven/" } - maven { url = "https://api.modrinth.com/maven" } // LazyDFU, Jade - maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu, EMI - maven { url = "https://maven.shedaniel.me/" } // Cloth Config, REI - maven { + maven { // Anvil Lib + name = "Cjsah Maven" + url = "https://server.cjsah.net:1002/maven/" + } + maven { // Modrinth File, LazyDFU, Jade + name = "Modrinth Maven" + url = "https://api.modrinth.com/maven" + content { + includeGroup "maven.modrinth" + } + } + maven { // Mod Menu, EMI + name = "TerraformersMC Maven" + url = "https://maven.terraformersmc.com/releases/" + } + maven { // Cloth Config, REI + name = "Shedaniel Maven" + url = "https://maven.shedaniel.me/" + } + maven { // CurseForge File + name = "CurseForge Maven" url "https://cursemaven.com" content { includeGroup "curse.maven" } - } // Curse Forge File - maven { + } + maven { // Patchouli name = "Jared's maven" url = "https://maven.blamejared.com/" } - maven { - url = "https://dvs1.progwml6.com/files/maven/" + maven { // Registrate Fork + name = "Ithundxr Maven" + url = "https://maven.ithundxr.dev/snapshots" } - maven { url = "https://maven.ithundxr.dev/snapshots" } // Registrate Fork - maven { url = "https://mvn.devos.one/snapshots/" } - maven { - // saps.dev Maven (KubeJS and Rhino) + maven { // KubeJS, Rhino + name = "Saps Maven" url = "https://maven.saps.dev/minecraft" content { includeGroup "dev.latvian.mods" @@ -29,6 +44,11 @@ repositories { } } maven { // TOP + name = "k-4u Maven" url "https://maven.k-4u.nl" } + maven { // Curios API + name = "OctoStudios Maven" + url = uri("https://maven.octo-studios.com/releases") + } } diff --git a/src/generated/resources/data/c/tags/item/tools/wrench.json b/src/generated/resources/data/c/tags/item/tools/wrench.json index 383afb480..54bcac999 100644 --- a/src/generated/resources/data/c/tags/item/tools/wrench.json +++ b/src/generated/resources/data/c/tags/item/tools/wrench.json @@ -1,6 +1,7 @@ { "values": [ "anvilcraft:anvil_hammer", - "anvilcraft:royal_anvil_hammer" + "anvilcraft:royal_anvil_hammer", + "anvilcraft:ember_anvil_hammer" ] } \ No newline at end of file diff --git a/src/main/java/dev/dubhe/anvilcraft/client/event/GuiLayerRegistrationEventListener.java b/src/main/java/dev/dubhe/anvilcraft/client/event/GuiLayerRegistrationEventListener.java index 8adcce5e2..bba8d5bbe 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/event/GuiLayerRegistrationEventListener.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/event/GuiLayerRegistrationEventListener.java @@ -52,7 +52,7 @@ public static void onRegister(RegisterGuiLayersEvent event) { screenHeight ); } - if (!(minecraft.player.getItemBySlot(EquipmentSlot.HEAD).getItem() instanceof IEngineerGoggles)) return; + if (!IEngineerGoggles.hasGoggles(minecraft.player)) return; HitResult hit = minecraft.hitResult; if (hit == null || hit.getType() != HitResult.Type.BLOCK) { return; diff --git a/src/main/java/dev/dubhe/anvilcraft/client/event/RenderEventListener.java b/src/main/java/dev/dubhe/anvilcraft/client/event/RenderEventListener.java index 70eab313b..d62cffd92 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/event/RenderEventListener.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/event/RenderEventListener.java @@ -16,6 +16,7 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.phys.BlockHitResult; @@ -67,15 +68,8 @@ public static void onRender(RenderLevelStageEvent event) { handItem, event.getPoseStack(), vertexConsumer3, camX, camY, camZ); } } - if (!(entity instanceof LivingEntity le)) return; - boolean bl = true; - for (ItemStack slot : le.getArmorSlots()) { - if (slot.getItem() instanceof IEngineerGoggles) { - bl = false; - break; - } - } - if (bl) return; + if (!(entity instanceof Player player)) return; + if (!IEngineerGoggles.hasGoggles(player)) return; PowerGridRenderer.render(event.getPoseStack(), bufferSource, vec3); HitResult hit = Minecraft.getInstance().hitResult; if (hit == null || hit.getType() != HitResult.Type.BLOCK) { diff --git a/src/main/java/dev/dubhe/anvilcraft/data/tags/ItemTagLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/tags/ItemTagLoader.java index d93200023..f4fff1418 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/tags/ItemTagLoader.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/tags/ItemTagLoader.java @@ -104,7 +104,8 @@ public static void init(@NotNull RegistrateTagsProvider provider) { .add(findResourceKey(Items.GLOW_BERRIES)); provider.addTag(ModItemTags.WRENCH) .add(findResourceKey(ModItems.ANVIL_HAMMER.get())) - .add(findResourceKey(ModItems.ROYAL_ANVIL_HAMMER.get())); + .add(findResourceKey(ModItems.ROYAL_ANVIL_HAMMER.get())) + .add(findResourceKey(ModItems.EMBER_ANVIL_HAMMER.get())); provider.addTag(ModItemTags.FIRE_STARTER) .add(findResourceKey(Items.TORCH)) .add(findResourceKey(Items.SOUL_TORCH)) diff --git a/src/main/java/dev/dubhe/anvilcraft/integration/curios/CuriosIntegration.java b/src/main/java/dev/dubhe/anvilcraft/integration/curios/CuriosIntegration.java new file mode 100644 index 000000000..c12e66875 --- /dev/null +++ b/src/main/java/dev/dubhe/anvilcraft/integration/curios/CuriosIntegration.java @@ -0,0 +1,59 @@ +package dev.dubhe.anvilcraft.integration.curios; + +import dev.anvilcraft.lib.integration.Integration; +import dev.dubhe.anvilcraft.AnvilCraft; +import dev.dubhe.anvilcraft.init.ModItems; +import dev.dubhe.anvilcraft.item.IEngineerGoggles; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.geom.builders.LayerDefinition; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.ModList; +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; +import org.jetbrains.annotations.NotNull; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.client.CuriosRendererRegistry; + +import java.util.Optional; + +public class CuriosIntegration implements Integration { + @Override + public void apply() { + Optional optional = ModList.get() + .getModContainerById(AnvilCraft.MOD_ID) + .map(ModContainer::getEventBus); + optional.ifPresent(iEventBus -> iEventBus.addListener(CuriosIntegration::setup)); + optional.ifPresent(iEventBus -> iEventBus.addListener(CuriosIntegration::onLayerRegister)); + } + + public static void setup(FMLCommonSetupEvent event) { + IEngineerGoggles.HAS_GOGGLES_SET.add(GogglesCurioItem::hasGoggles); + CuriosApi.registerCurio(ModItems.ANVIL_HAMMER.get(), new GogglesCurioItem()); + CuriosApi.registerCurio(ModItems.ROYAL_ANVIL_HAMMER.get(), new GogglesCurioItem()); + CuriosApi.registerCurio(ModItems.EMBER_ANVIL_HAMMER.get(), new GogglesCurioItem()); + } + + @Override + public void applyClient() { + CuriosRendererRegistry.register( + ModItems.ANVIL_HAMMER.get(), + () -> new GogglesCurioRenderer(Minecraft.getInstance().getEntityModels().bakeLayer(GogglesCurioRenderer.LAYER)) + ); + CuriosRendererRegistry.register( + ModItems.ROYAL_ANVIL_HAMMER.get(), + () -> new GogglesCurioRenderer(Minecraft.getInstance().getEntityModels().bakeLayer(GogglesCurioRenderer.LAYER)) + ); + CuriosRendererRegistry.register( + ModItems.EMBER_ANVIL_HAMMER.get(), + () -> new GogglesCurioRenderer(Minecraft.getInstance().getEntityModels().bakeLayer(GogglesCurioRenderer.LAYER)) + ); + } + + public static void onLayerRegister(final EntityRenderersEvent.@NotNull RegisterLayerDefinitions event) { + event.registerLayerDefinition( + GogglesCurioRenderer.LAYER, + () -> LayerDefinition.create(GogglesCurioRenderer.mesh(), 1, 1) + ); + } +} diff --git a/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioItem.java b/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioItem.java new file mode 100644 index 000000000..f1274a7c0 --- /dev/null +++ b/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioItem.java @@ -0,0 +1,23 @@ +package dev.dubhe.anvilcraft.integration.curios; + +import dev.dubhe.anvilcraft.item.IEngineerGoggles; +import net.minecraft.world.entity.player.Player; +import top.theillusivec4.curios.api.CuriosApi; +import top.theillusivec4.curios.api.SlotResult; +import top.theillusivec4.curios.api.type.capability.ICurioItem; +import top.theillusivec4.curios.api.type.capability.ICuriosItemHandler; + +import java.util.Optional; + +public class GogglesCurioItem implements ICurioItem { + public static boolean hasGoggles(Player player) { + Optional inventory = CuriosApi.getCuriosInventory(player); + if (inventory.isPresent()) { + ICuriosItemHandler itemHandler = inventory.get(); + for (SlotResult head : itemHandler.findCurios("head")) { + if (head.stack().getItem() instanceof IEngineerGoggles) return true; + } + } + return false; + } +} diff --git a/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioRenderer.java b/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioRenderer.java new file mode 100644 index 000000000..4d3aa9419 --- /dev/null +++ b/src/main/java/dev/dubhe/anvilcraft/integration/curios/GogglesCurioRenderer.java @@ -0,0 +1,85 @@ +package dev.dubhe.anvilcraft.integration.curios; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Axis; +import dev.dubhe.anvilcraft.AnvilCraft; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.EntityModel; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.client.model.geom.ModelLayerLocation; +import net.minecraft.client.model.geom.ModelPart; +import net.minecraft.client.model.geom.PartPose; +import net.minecraft.client.model.geom.builders.CubeDeformation; +import net.minecraft.client.model.geom.builders.CubeListBuilder; +import net.minecraft.client.model.geom.builders.MeshDefinition; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.RenderLayerParent; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import org.jetbrains.annotations.NotNull; +import top.theillusivec4.curios.api.SlotContext; +import top.theillusivec4.curios.api.client.ICurioRenderer; + +public class GogglesCurioRenderer implements ICurioRenderer { + public static final ModelLayerLocation LAYER = new ModelLayerLocation(AnvilCraft.of("goggles"), "goggles"); + + private final HumanoidModel model; + + public GogglesCurioRenderer(ModelPart part) { + this.model = new HumanoidModel<>(part); + } + + @Override + public > void render( + ItemStack stack, + @NotNull SlotContext slotContext, + @NotNull PoseStack matrixStack, + RenderLayerParent renderLayerParent, + MultiBufferSource renderTypeBuffer, + int light, + float limbSwing, + float limbSwingAmount, + float partialTicks, + float ageInTicks, + float netHeadYaw, + float headPitch + ) { + // Prepare values for transformation + model.setupAnim(slotContext.entity(), limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch); + model.prepareMobModel(slotContext.entity(), limbSwing, limbSwingAmount, partialTicks); + ICurioRenderer.followHeadRotations(slotContext.entity(), model.head); + + // Translate and rotate with our head + matrixStack.pushPose(); + matrixStack.translate(model.head.x / 16.0, model.head.y / 16.0, model.head.z / 16.0); + matrixStack.mulPose(Axis.YP.rotation(model.head.yRot)); + matrixStack.mulPose(Axis.XP.rotation(model.head.xRot)); + + // Translate and scale to our head + matrixStack.translate(0, -0.25, 0); + matrixStack.mulPose(Axis.ZP.rotationDegrees(180.0f)); + matrixStack.scale(0.625f, 0.625f, 0.625f); + + if (!slotContext.entity().getItemBySlot(EquipmentSlot.HEAD).isEmpty()) { + matrixStack.mulPose(Axis.ZP.rotationDegrees(180.0f)); + matrixStack.translate(0, -0.25, 0); + } + + // Render + Minecraft mc = Minecraft.getInstance(); + mc.getItemRenderer() + .renderStatic(stack, ItemDisplayContext.HEAD, light, OverlayTexture.NO_OVERLAY, matrixStack, + renderTypeBuffer, mc.level, 0); + matrixStack.popPose(); + } + + public static @NotNull MeshDefinition mesh() { + CubeListBuilder builder = new CubeListBuilder(); + MeshDefinition mesh = HumanoidModel.createMesh(CubeDeformation.NONE, 0); + mesh.getRoot().addOrReplaceChild("head", builder, PartPose.ZERO); + return mesh; + } +} diff --git a/src/main/java/dev/dubhe/anvilcraft/item/IEngineerGoggles.java b/src/main/java/dev/dubhe/anvilcraft/item/IEngineerGoggles.java index 70b1eee28..3d919f126 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/IEngineerGoggles.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/IEngineerGoggles.java @@ -1,6 +1,27 @@ package dev.dubhe.anvilcraft.item; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Player; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; + /** * 工程师护目镜 */ -public interface IEngineerGoggles {} +public interface IEngineerGoggles { + Set> HAS_GOGGLES_SET = new HashSet<>() {{ + this.add(player -> player.getItemBySlot(EquipmentSlot.HEAD).getItem() instanceof IEngineerGoggles); + }}; + + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + static boolean hasGoggles(Player player) { + for (Function function : HAS_GOGGLES_SET) { + if (function.apply(player)) { + return true; + } + } + return false; + } +} diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index e947e2616..af64348a1 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -49,6 +49,9 @@ file="META-INF/accesstransformer.cfg" # The coremods config file path is not configurable and is always loaded from META-INF/coremods.json +[modproperties."${mod_id}".anvillib.integrations] +curios = ["dev.dubhe.anvilcraft.integration.curios.CuriosIntegration"] + # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies."${mod_id}"]] #optional modId="neoforge" #mandatory diff --git a/src/main/resources/data/anvilcraft/curios/entities/player.json b/src/main/resources/data/anvilcraft/curios/entities/player.json new file mode 100644 index 000000000..4816a2167 --- /dev/null +++ b/src/main/resources/data/anvilcraft/curios/entities/player.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "entities": [ + "minecraft:player" + ], + "slots": [ + "head" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/curios/tags/item/head.json b/src/main/resources/data/curios/tags/item/head.json new file mode 100644 index 000000000..52570f848 --- /dev/null +++ b/src/main/resources/data/curios/tags/item/head.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "anvilcraft:anvil_hammer", + "anvilcraft:royal_anvil_hammer", + "anvilcraft:ember_anvil_hammer" + ] +} \ No newline at end of file From 63268c17419aa771677924e85590c33215e82d5b Mon Sep 17 00:00:00 2001 From: Crowdin Bot Date: Fri, 20 Dec 2024 00:40:07 +0000 Subject: [PATCH 5/5] New Crowdin translations by GitHub Action --- src/main/resources/assets/anvilcraft/lang/de_de.json | 3 +++ src/main/resources/assets/anvilcraft/lang/es_es.json | 3 +++ src/main/resources/assets/anvilcraft/lang/fr_fr.json | 3 +++ src/main/resources/assets/anvilcraft/lang/ja_jp.json | 3 +++ src/main/resources/assets/anvilcraft/lang/ko_kr.json | 3 +++ src/main/resources/assets/anvilcraft/lang/lzh.json | 3 +++ src/main/resources/assets/anvilcraft/lang/ru_ru.json | 3 +++ src/main/resources/assets/anvilcraft/lang/zh_cn.json | 3 +++ src/main/resources/assets/anvilcraft/lang/zh_hk.json | 3 +++ src/main/resources/assets/anvilcraft/lang/zh_meme.json | 3 +++ src/main/resources/assets/anvilcraft/lang/zh_tw.json | 3 +++ 11 files changed, 33 insertions(+) diff --git a/src/main/resources/assets/anvilcraft/lang/de_de.json b/src/main/resources/assets/anvilcraft/lang/de_de.json index b0852eabf..5010c7c7d 100644 --- a/src/main/resources/assets/anvilcraft/lang/de_de.json +++ b/src/main/resources/assets/anvilcraft/lang/de_de.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "Aufsteigender Amboss", "entity.anvilcraft.falling_giant_anvil": "Fallender riesiger Amboss", "entity.anvilcraft.falling_spectral_block": "Fallender Spektralblock", diff --git a/src/main/resources/assets/anvilcraft/lang/es_es.json b/src/main/resources/assets/anvilcraft/lang/es_es.json index 1b138b30a..061501a1d 100644 --- a/src/main/resources/assets/anvilcraft/lang/es_es.json +++ b/src/main/resources/assets/anvilcraft/lang/es_es.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "Un yunque que se eleva", "entity.anvilcraft.falling_giant_anvil": "Bigornia Gigante Caidora", "entity.anvilcraft.falling_spectral_block": "Caída de bloque espectral", diff --git a/src/main/resources/assets/anvilcraft/lang/fr_fr.json b/src/main/resources/assets/anvilcraft/lang/fr_fr.json index dca1d385d..4b9359954 100644 --- a/src/main/resources/assets/anvilcraft/lang/fr_fr.json +++ b/src/main/resources/assets/anvilcraft/lang/fr_fr.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Bordure", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Bûcheronne", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Récolter", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "Une enclume qui s'élève", "entity.anvilcraft.falling_giant_anvil": "Enclume géante qui tombe", "entity.anvilcraft.falling_spectral_block": "Bloc spectral descendant", diff --git a/src/main/resources/assets/anvilcraft/lang/ja_jp.json b/src/main/resources/assets/anvilcraft/lang/ja_jp.json index 2cb29a396..3551278c4 100644 --- a/src/main/resources/assets/anvilcraft/lang/ja_jp.json +++ b/src/main/resources/assets/anvilcraft/lang/ja_jp.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "立ち上がる金床", "entity.anvilcraft.falling_giant_anvil": "落下する巨大な金床", "entity.anvilcraft.falling_spectral_block": "Falling Spectral ブロック", diff --git a/src/main/resources/assets/anvilcraft/lang/ko_kr.json b/src/main/resources/assets/anvilcraft/lang/ko_kr.json index 6dc2fcbc2..e72c8f871 100644 --- a/src/main/resources/assets/anvilcraft/lang/ko_kr.json +++ b/src/main/resources/assets/anvilcraft/lang/ko_kr.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "상승하는 모루", "entity.anvilcraft.falling_giant_anvil": "떨어지는 거대한 안빌", "entity.anvilcraft.falling_spectral_block": "떨어지는 스펙트럼 블록", diff --git a/src/main/resources/assets/anvilcraft/lang/lzh.json b/src/main/resources/assets/anvilcraft/lang/lzh.json index 207d86906..af3256d80 100644 --- a/src/main/resources/assets/anvilcraft/lang/lzh.json +++ b/src/main/resources/assets/anvilcraft/lang/lzh.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "斬首", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "伐木", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "收割", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "昇之鐵砧", "entity.anvilcraft.falling_giant_anvil": "落之巨砧", "entity.anvilcraft.falling_spectral_block": "落之幻砧", diff --git a/src/main/resources/assets/anvilcraft/lang/ru_ru.json b/src/main/resources/assets/anvilcraft/lang/ru_ru.json index 93566a91a..4d63c11cb 100644 --- a/src/main/resources/assets/anvilcraft/lang/ru_ru.json +++ b/src/main/resources/assets/anvilcraft/lang/ru_ru.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "Beheading", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "Felling", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "Harvest", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "Наковальня, которая поднимается", "entity.anvilcraft.falling_giant_anvil": "Падающая Гигантская Наковальня", "entity.anvilcraft.falling_spectral_block": "Падающий спектральный блок", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_cn.json b/src/main/resources/assets/anvilcraft/lang/zh_cn.json index 1a131a85e..d1b3e020b 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_cn.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "斩首", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "伐木", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "收割", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "上升的铁砧", "entity.anvilcraft.falling_giant_anvil": "下落的巨型铁砧", "entity.anvilcraft.falling_spectral_block": "下落的幻灵方块", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_hk.json b/src/main/resources/assets/anvilcraft/lang/zh_hk.json index 2604cc7c7..a54ee2ea8 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_hk.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_hk.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "斬首", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "伐木", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "收割", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "上升嘅鐵砧", "entity.anvilcraft.falling_giant_anvil": "下落嘅巨型鐵砧", "entity.anvilcraft.falling_spectral_block": "下落嘅幻靈鐵砧", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_meme.json b/src/main/resources/assets/anvilcraft/lang/zh_meme.json index d798df097..2003d1006 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_meme.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_meme.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "杀头", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "砍树", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "收割", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "上升的哐当", "entity.anvilcraft.falling_giant_anvil": "下落的咣咚", "entity.anvilcraft.falling_spectral_block": "下落的光谱方块", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_tw.json b/src/main/resources/assets/anvilcraft/lang/zh_tw.json index 8cf1ce724..56bb05986 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_tw.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_tw.json @@ -266,8 +266,11 @@ "death.attack.anvilcraft.laser": "%1$s was pierced by laser", "death.attack.anvilcraft.lost_in_time": "%1$s was lost in the river of time", "enchantment.anvilcraft.beheading": "斬首", + "enchantment.anvilcraft.beheading.desc": "Enhance the probability of the Wither Skeleton Skull dropping and cause mobs (including players) that were previously unable to drop their heads to do so.", "enchantment.anvilcraft.felling": "伐木", + "enchantment.anvilcraft.felling.desc": "Harvest mature crops within a certain range and replant them. The first level range is 3 * 3, the second level is 5 * 5, and the third level is 7 * 7, expanding one circle per level.", "enchantment.anvilcraft.harvest": "收割", + "enchantment.anvilcraft.harvest.desc": "Chain collection of logs and their variants, with a default configuration of enchantment level n, can chain collect up to 1+2n blocks at a time.", "entity.anvilcraft.animate_ascending_block": "上升的鐵砧", "entity.anvilcraft.falling_giant_anvil": "掉落的巨型鐵砧", "entity.anvilcraft.falling_spectral_block": "掉落的幻靈鐵砧",