8000 Integrate BytecodeAnalyser into the GitHub Actions build by DerEchtePilz · Pull Request #643 · CommandAPI/CommandAPI · GitHub
[go: up one dir, main page]
Skip to content

Integrate BytecodeAnalyser into the GitHub Actions build #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Apr 23, 2025
Merged

Integrate BytecodeAnalyser into the GitHub Actions build #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
448c8f5
Disable all steps for now (revert later and squash this if merging)
DerEchtePilz Apr 23, 2025
5ee2254
Try to clone and compile
DerEchtePilz Apr 23, 2025
196838f
Does this compile? Potentially upload to validate cloning and compili…
DerEchtePilz Apr 23, 2025
f74aaf7
Enable all steps again
DerEchtePilz Apr 23, 2025
58dbbc6
This should move the BytecodeAnalyser jar
DerEchtePilz Apr 23, 2025
edc9d48
It should still compile
DerEchtePilz Apr 23, 2025
86fc759
Hopefully this runs
DerEchtePilz Apr 23, 2025
d081e75
Disable some steps again
DerEchtePilz Apr 23, 2025
fa7c3f2
Look at files
DerEchtePilz Apr 23, 2025
b914f6c
Do more looking at files
DerEchtePilz Apr 23, 2025
f066959
Also run the script for now to compile NMS_Common for all versions
DerEchtePilz Apr 23, 2025
8a3746b
Actually look at the files
DerEchtePilz Apr 23, 2025
3327d44
More checking
DerEchtePilz Apr 23, 2025
fa2cba5
Use new branch and expect that files are unzipped
DerEchtePilz Apr 23, 2025
1e5cd0e
More testing
DerEchtePilz Apr 23, 2025
f63197c
Okay, now hope it fails
DerEchtePilz Apr 23, 2025
48f3ecc
Remove left-over inspection step
DerEchtePilz Apr 23, 2025
c976454
Switch back to main branch and hope the actions succeeds
DerEchtePilz Apr 23, 2025
da22b99
Cleanup and enable all steps again
DerEchtePilz Apr 23, 2025
9330ab6
Properly name action step
DerEchtePilz Apr 23, 2025
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
Prev Previous commit
Next Next commit
Okay, now hope it fails
  • Loading branch information
@DerEchtePilz
DerEchtePilz committed Apr 23, 2025
commit f63197c8f5677de5a3f85c2eb15b03889d42daaa
8 changes: 0 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ jobs:
chmod +x BytecodeAnalyser*.jar
java -jar BytecodeAnalyser*.jar

- name: Inspect the 1.20.1 dev/jorel/commandapi/nms folder
run: |
cd commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-nms-common/target/1.20.1
echo "Verify that folders were extracted"
ls
echo "Inspect the NMS_Common.class method bytecode"
cat bytecode_1.20.1_NMS_Common.txt

# - name: validate version-specific dependencies (nms-common)
# run: |
# nms_common_path="commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-nms-common/target/classes/dev/jorel/commandapi/nms/NMS_Common.class"
Expand Down
7 changes: 7 additions & 0 deletions ...t-nms/commandapi-bukkit-nms-common/src/main/java/dev/jorel/commandapi/nms/NMS_Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scoreboard.Objective;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -365,6 +366,12 @@ public final <NBTContainer> Object getNBTCompound(CommandContext<CommandSourceSt
return nbtContainerConstructor.apply(CompoundTagArgument.getCompoundTag(cmdCtx, key));
}

@Override
public Objective getObjective(CommandContext<CommandSourceStack> cmdCtx, String key) throws CommandSyntaxException {
String objectiveName = ObjectiveArgument.getObjective(cmdCtx, key).getName();
return Bukkit.getScoreboardManager().getMainScoreboard().getObjective(objectiveName);
}

@Override
public final String getObjectiveCriteria(CommandContext<CommandSourceStack> cmdCtx, String key) {
return ObjectiveCriteriaArgument.getCriteria(cmdCtx, key).getName();
Expand Down
0