Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 93 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "java",
"request": "launch",
"name": "Client",
"presentation": {
"group": "Mod Development - AdvancedPeripherals",
"order": 0
},
"projectName": "AdvancedPeripherals",
"mainClass": "net.neoforged.devlaunch.Main",
"args": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\clientRunProgramArgs.txt"
],
"vmArgs": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\clientRunVmArgs.txt",
"-Dfml.modFolders\u003dadvancedperipherals%%C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\bin\\main"
],
"cwd": "${workspaceFolder}\\run",
"env": {},
"console": "internalConsole",
"shortenCommandLine": "none"
},
{
"type": "java",
"request": "launch",
"name": "Data",
"presentation": {
"group": "Mod Development - AdvancedPeripherals",
"order": 1
},
"projectName": "AdvancedPeripherals",
"mainClass": "net.neoforged.devlaunch.Main",
"args": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\dataRunProgramArgs.txt"
],
"vmArgs": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\dataRunVmArgs.txt",
"-Dfml.modFolders\u003dadvancedperipherals%%C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\bin\\main"
],
"cwd": "${workspaceFolder}\\run",
"env": {},
"console": "internalConsole",
"shortenCommandLine": "none"
},
{
"type": "java",
"request": "launch",
"name": "GameTestServer",
"presentation": {
"group": "Mod Development - AdvancedPeripherals",
"order": 2
},
"projectName": "AdvancedPeripherals",
"mainClass": "net.neoforged.devlaunch.Main",
"args": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\gameTestServerRunProgramArgs.txt"
],
"vmArgs": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\gameTestServerRunVmArgs.txt",
"-Dfml.modFolders\u003dadvancedperipherals%%C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\bin\\main"
],
"cwd": "${workspaceFolder}\\run",
"env": {},
"console": "internalConsole",
"shortenCommandLine": "none"
},
{
"type": "java",
"request": "launch",
"name": "Server",
"presentation": {
"group": "Mod Development - AdvancedPeripherals",
"order": 3
},
"projectName": "AdvancedPeripherals",
"mainClass": "net.neoforged.devlaunch.Main",
"args": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\serverRunProgramArgs.txt"
],
"vmArgs": [
"@C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\build\\moddev\\serverRunVmArgs.txt",
"-Dfml.modFolders\u003dadvancedperipherals%%C:\\Users\\Administrator\\Documents\\AdvancedPeripherals\\bin\\main"
],
"cwd": "${workspaceFolder}\\run",
"env": {},
"console": "internalConsole",
"shortenCommandLine": "none"
}
]
}
41 changes: 0 additions & 41 deletions docs/RELEASE.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public static Pair<Long, MekanismKey> findAEChemicalFromStack(MEStorage monitor,
}

@NotNull
public static Pair<Long, MekanismKey> findAEChemicalFromFilter(MEStorage monitor, @Nullable ICraftingService crafting, ChemicalFilter filter) {
public static Pair<Long, MekanismKey> findAEChemicalFromFilter(MEStorage monitor, @Nullable ICraftingService crafting, ChemicalFilter filter) {
for (Object2LongMap.Entry<AEKey> temp : monitor.getAvailableStacks()) {
if (temp.getKey() instanceof MekanismKey key && filter.test(key.getStack()))
return Pair.of(temp.getLongValue(), key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,10 @@ public void jobStateChanged() {
}

if (jobLink.isCanceled() && !isJobCanceled) {
fireEvent(false, StatusConstants.JOB_CANCELED);
// If we already force-marked this job as done, do not emit a canceled event
if (!isJobDone) {
fireEvent(false, StatusConstants.JOB_CANCELED);
}
setJobCanceled();
return;
}
Expand All @@ -271,6 +274,17 @@ public void jobStateChanged() {
}
}

/**
* Manually fire JOB_DONE notification for force completed jobs.
* This bypasses the normal jobLink.isDone() check.
*/
public void forceFireJobDone() {
if (!isJobDone) {
fireEvent(false, StatusConstants.JOB_DONE);
setJobDone();
}
}

private void prepareCPUAndStatus(ICraftingService service) {
if (jobLink == null || jobStatus != null || !startedCrafting) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.capabilities.BlockCapability;


import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.items.wrapper.PlayerArmorInvWrapper;
Expand Down
Loading
Loading