complete ammo features

zyxkad · zyxkad · commit 00c1ecb8643e · 2025-08-08T22:02:26.000-06:00
diff --git a/common/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntity.java b/common/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntity.java
@@ -64,13 +64,15 @@ public class AmmoAssemblerBlockEntity extends BlockEntity {
 	private volatile AssembleResult assembleResult = AssembleResult.SUCCESS;
 	private String shipSlug = null;
 	private int energyStored = 0;
-	private int energyConsumption = 0; // TODO
+	private int energyConsumption = Config.ammoAssembleEnergy; // TODO
 	private final Queue<BlockPos> queueing = new ArrayDeque<>();
 	private final DenseBlockPosSet blocks = new DenseBlockPosSet();
 	private final DenseBlockPosSet checked = new DenseBlockPosSet();
 	private final AABBi box = new AABBi();
 
 	private Runnable assembleFinishCallback = null;
+	Object energyStorage = null;
+	Object peripheral = null;
 
 	public AmmoAssemblerBlockEntity(BlockPos pos, BlockState state) {
 		super(VSCRegistry.BlockEntities.AMMO_ASSEMBLER.get(), pos, state);
@@ -106,7 +108,7 @@ public int receiveEnergy(final int maxReceive, final boolean simulate) {
 		if (avaliable <= 0) {
 			return 0;
 		}
-		final int received = Math.min(avaliable, maxReceive);
+		final int received = Math.min(Math.min(avaliable, maxReceive), (this.getMaxEnergyStored() + 99) / 100);
 		if (!simulate) {
 			this.energyStored += received;
 		}
@@ -124,6 +126,7 @@ public int getMaxEnergyStored() {
 	@Override
 	public void load(final CompoundTag data) {
 		this.energyStored = data.getInt("EnergyStored");
+		this.triggering = data.getBoolean("Powered");
 		try {
 			this.assembleResult = AssembleResult.valueOf(data.getString("AssembleResult"));
 		} catch (IllegalArgumentException e) {
@@ -134,6 +137,7 @@ public void load(final CompoundTag data) {
 	@Override
 	public void saveAdditional(final CompoundTag data) {
 		data.putInt("EnergyStored", this.energyStored);
+		data.putBoolean("Powered", this.triggering);
 		this.saveShared(data);
 	}
 
diff --git a/common/src/main/resources/assets/vschunkloader/lang/en_us.json b/common/src/main/resources/assets/vschunkloader/lang/en_us.json
@@ -1,4 +1,6 @@
 {
+	"block.vschunkloader.ammo_assembler": "Ammo Assembler",
+	"block.vschunkloader.ammo_manager": "Ammo Manager",
 	"block.vschunkloader.chunk_loader": "Chunk Loader",
 	"block.vschunkloader.chunk_loader_weak": "Weak Chunk Loader",
 	"command.vschunkloader.forceload": "Successfully force loaded %d ships",
diff --git a/common/src/main/resources/assets/vschunkloader/lang/zh_cn.json b/common/src/main/resources/assets/vschunkloader/lang/zh_cn.json
@@ -1,4 +1,6 @@
 {
+	"block.vschunkloader.ammo_assembler": "弹药组装器",
+	"block.vschunkloader.ammo_manager": "弹药管理器",
 	"block.vschunkloader.chunk_loader": "区块加载器",
 	"block.vschunkloader.chunk_loader_weak": "脆弱的区块加载器",
 	"command.vschunkloader.forceload": "成功强制加载 %d 个物理结构",
diff --git a/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -1,6 +1,8 @@
 {
 	"replace": false,
 	"values": [
+		"vschunkloader:ammo_assembler",
+		"vschunkloader:ammo_manager",
 		"vschunkloader:chunk_loader",
 		"vschunkloader:chunk_loader_weak"
 	]
diff --git a/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/common/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json
@@ -1,6 +1,8 @@
 {
 	"replace": false,
 	"values": [
+		"vschunkloader:ammo_assembler",
+		"vschunkloader:ammo_manager",
 		"vschunkloader:chunk_loader_weak"
 	]
 }
diff --git a/common/src/main/resources/data/vschunkloader/loot_tables/blocks/ammo_assembler.json b/common/src/main/resources/data/vschunkloader/loot_tables/blocks/ammo_assembler.json
@@ -0,0 +1,14 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "vschunkloader:ammo_assembler"
+				}
+			]
+		}
+	]
+}
diff --git a/common/src/main/resources/data/vschunkloader/loot_tables/blocks/ammo_manager.json b/common/src/main/resources/data/vschunkloader/loot_tables/blocks/ammo_manager.json
@@ -0,0 +1,14 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "vschunkloader:ammo_manager"
+				}
+			]
+		}
+	]
+}
diff --git a/common/src/main/resources/data/vschunkloader/recipes/ammo_assembler.json b/common/src/main/resources/data/vschunkloader/recipes/ammo_assembler.json
@@ -0,0 +1,29 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"GMG",
+		"LSL",
+		"GPG"
+	],
+	"key": {
+		"G": {
+			"item": "minecraft:gold_ingot"
+		},
+		"L": {
+			"item": "minecraft:lodestone"
+		},
+		"M": {
+			"item": "minecraft:map"
+		},
+		"P": {
+			"item": "minecraft:piston"
+		},
+		"S": {
+			"item": "minecraft:slime_block"
+		}
+	},
+	"result": {
+		"item": "vschunkloader:ammo_assembler",
+		"count": 1
+	}
+}
diff --git a/common/src/main/resources/data/vschunkloader/recipes/ammo_manager.json b/common/src/main/resources/data/vschunkloader/recipes/ammo_manager.json
@@ -0,0 +1,32 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"CEC",
+		"LOL",
+		"GAG"
+	],
+	"key": {
+		"A": {
+			"item": "minecraft:anvil"
+		},
+		"C": {
+			"item": "minecraft:copper_ingot"
+		},
+		"E": {
+			"item": "minecraft:ender_eye"
+		},
+		"G": {
+			"item": "minecraft:gold_ingot"
+		},
+		"L": {
+			"item": "minecraft:lodestone"
+		},
+		"O": {
+			"item": "minecraft:compass"
+		}
+	},
+	"result": {
+		"item": "vschunkloader:ammo_manager",
+		"count": 1
+	}
+}
diff --git a/common/src/main/resources/data/vschunkloader/recipes/chunk_loader_weak.json b/common/src/main/resources/data/vschunkloader/recipes/chunk_loader_weak.json
@@ -2,12 +2,12 @@
 	"type": "minecraft:crafting_shaped",
 	"pattern": [
 		"ITI",
-		"EBO",
+		"EDO",
 		"IHI"
 	],
 	"key": {
-		"B": {
-			"item": "minecraft:lodestone"
+		"D": {
+			"item": "minecraft:ender_pearl"
 		},
 		"E": {
 			"item": "minecraft:emerald"
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -34,12 +34,12 @@ dependencies {
 	modRuntimeOnly "com.terraformersmc:modmenu:3.2.3"
 	modRuntimeOnly "me.shedaniel.cloth:cloth-config:${cloth_config_version}"
 
-	modApi "org.valkyrienskies:valkyrienskies-120-fabric:${vs2_version}"
+	modCompileOnly "org.valkyrienskies:valkyrienskies-120-fabric:${vs2_version}"
 
 	modCompileOnly "maven.modrinth:jade:${jade_version}+fabric"
 	modRuntimeOnly "maven.modrinth:jade:${jade_version}+fabric"
 
-	compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-common:${cct_version}"
+	modCompileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-fabric:${cct_version}"
 
 	modCompileOnly "com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}"
 	modRuntimeOnly "com.simibubi.create:create-fabric-${minecraft_version}:${create_fabric_version}"
diff --git a/fabric/src/main/java/com/github/litermc/vschunkloader/block/BlockCapabilityProviders.java b/fabric/src/main/java/com/github/litermc/vschunkloader/block/BlockCapabilityProviders.java
@@ -1,9 +1,12 @@
 package com.github.litermc.vschunkloader.block;
 
+import com.github.litermc.vschunkloader.block.ammo.AmmoAssemblerBlockEntityCapabilityProvider;
+
 public final class BlockCapabilityProviders {
 	private BlockCapabilityProviders() {}
 
 	public static void register() {
+		AmmoAssemblerBlockEntityCapabilityProvider.register();
 		ChunkLoaderBlockEntityCapabilityProvider.register();
 	}
 }
diff --git a/fabric/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntityCapabilityProvider.java b/fabric/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntityCapabilityProvider.java
@@ -0,0 +1,83 @@
+package com.github.litermc.vschunkloader.block.ammo;
+
+import com.github.litermc.vschunkloader.VSCRegistry;
+import com.github.litermc.vschunkloader.compat.CompatMods;
+
+import net.fabricmc.fabric.api.transfer.v1.transaction.TransactionContext;
+import net.minecraft.core.Direction;
+import team.reborn.energy.api.EnergyStorage;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.api.peripheral.PeripheralLookup;
+
+import java.util.function.BiFunction;
+
+public class AmmoAssemblerBlockEntityCapabilityProvider {
+	public static void register() {
+		EnergyStorage.SIDED.registerForBlockEntity(AmmoAssemblerBlockEntityCapabilityProvider::energyStorageGetter, VSCRegistry.BlockEntities.AMMO_ASSEMBLER.get());
+		if (CompatMods.COMPUTERCRAFT.isLoaded()) {
+			PeripheralLookup.get().registerForBlockEntity(AmmoAssemblerBlockEntityCapabilityProvider::peripheralGetter, VSCRegistry.BlockEntities.AMMO_ASSEMBLER.get());
+		}
+	}
+
+	private static EnergyStorage energyStorageGetter(final AmmoAssemblerBlockEntity be, final Direction side) {
+		if (be.energyStorage == null) {
+			be.energyStorage = new EnergyStorageImpl(be);
+		}
+		return (EnergyStorage)(be.energyStorage);
+	}
+
+	private static <T> T peripheralGetter(final AmmoAssemblerBlockEntity be, final Direction side) {
+		if (be.peripheral == null) {
+			be.peripheral = be.createPeripheral();
+		}
+		return (T)(be.peripheral);
+	}
+
+	private static final class EnergyStorageImpl implements EnergyStorage {
+		private final AmmoAssemblerBlockEntity be;
+
+		private EnergyStorageImpl(final AmmoAssemblerBlockEntity be) {
+			this.be = be;
+		}
+
+		@Override
+		public boolean supportsInsertion() {
+			return true;
+		}
+
+		@Override
+		public long insert(final long maxAmount, final TransactionContext transaction) {
+			final int maxReceive = maxAmount > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int)(maxAmount);
+			final int recieved = this.be.receiveEnergy(maxReceive, true);
+			if (recieved > 0) {
+				transaction.addCloseCallback((transactionCtx, result) -> {
+					if (result.wasCommitted()) {
+						this.be.receiveEnergy(maxReceive, false);
+					}
+				});
+			}
+			return recieved;
+		}
+
+		@Override
+		public boolean supportsExtraction() {
+			return false;
+		}
+
+		@Override
+		public long extract(final long maxAmount, final TransactionContext transaction) {
+			return 0;
+		}
+
+		@Override
+		public long getAmount() {
+			return this.be.getEnergyStored();
+		}
+
+		@Override
+		public long getCapacity() {
+			return this.be.getMaxEnergyStored();
+		}
+	}
+}
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -60,7 +60,7 @@ dependencies {
 	modCompileOnly "maven.modrinth:jade:${jade_version}+forge"
 	modRuntimeOnly "maven.modrinth:jade:${jade_version}+forge"
 
-	compileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cct_version}"
+	modCompileOnly "cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cct_version}"
 
 	modCompileOnly "com.simibubi.create:create-${minecraft_version}:${create_version}:all"
 	modRuntimeOnly "com.simibubi.create:create-${minecraft_version}:${create_version}:all"
diff --git a/forge/src/main/java/com/github/litermc/vschunkloader/block/BlockCapabilityProviders.java b/forge/src/main/java/com/github/litermc/vschunkloader/block/BlockCapabilityProviders.java
@@ -1,5 +1,8 @@
 package com.github.litermc.vschunkloader.block;
 
+import com.github.litermc.vschunkloader.block.ammo.AmmoAssemblerBlockEntity;
+import com.github.litermc.vschunkloader.block.ammo.AmmoAssemblerBlockEntityCapabilityProvider;
+
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
@@ -9,8 +12,13 @@ private BlockCapabilityProviders() {}
 
 	public static void register() {
 		MinecraftForge.EVENT_BUS.addGenericListener(BlockEntity.class, (AttachCapabilitiesEvent<? extends BlockEntity> event) -> {
+			if (event.getObject() instanceof AmmoAssemblerBlockEntity) {
+				AmmoAssemblerBlockEntityCapabilityProvider.onGatherCapabilities((AttachCapabilitiesEvent<AmmoAssemblerBlockEntity>) (event));
+				return;
+			}
 			if (event.getObject() instanceof ChunkLoaderBlockEntity) {
 				ChunkLoaderBlockEntityCapabilityProvider.onGatherCapabilities((AttachCapabilitiesEvent<ChunkLoaderBlockEntity>) (event));
+				return;
 			}
 		});
 	}
diff --git a/forge/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntityCapabilityProvider.java b/forge/src/main/java/com/github/litermc/vschunkloader/block/ammo/AmmoAssemblerBlockEntityCapabilityProvider.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`{`
	`2`	`+ "block.vschunkloader.ammo_assembler": "Ammo Assembler",`
	`3`	`+ "block.vschunkloader.ammo_manager": "Ammo Manager",`
`2`	`4`	`"block.vschunkloader.chunk_loader": "Chunk Loader",`
`3`	`5`	`"block.vschunkloader.chunk_loader_weak": "Weak Chunk Loader",`
`4`	`6`	`"command.vschunkloader.forceload": "Successfully force loaded %d ships",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
	`4`	`+ "vschunkloader:ammo_assembler",`
	`5`	`+ "vschunkloader:ammo_manager",`
`4`	`6`	`"vschunkloader:chunk_loader",`
`5`	`7`	`"vschunkloader:chunk_loader_weak"`
`6`	`8`	`]`