Skip to content

fix disabled supervision still blocking furnace input, off-hand dissection damage, and off-hand ranged XP #2

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

Open
Spagles wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix disabled supervision still blocking furnace input, off-hand dissection damage, and off-hand ranged XP #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77fb3ac
fix furnace input restrictions still applying when smelting/cooking s…
Spagles Aug 4, 2026
2a4e0b0
fix dissection damaging the wrong hand's tool when using off-hand
Spagles Aug 4, 2026
c599681
fix ranged combat XP not granted when bow/crossbow is in off-hand
Spagles Aug 4, 2026
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
4 changes: 4 additions & 0 deletions src/main/java/net/maxello/knowledgebound/mechanics/gathering/KnowledgeEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,10 @@ private static void registerRangedCombatXp() {
// what are we holding?
KnowledgeDefinition.ToolTier toolTier =
ToolTierHelper.fromItem(player.getMainHandStack());
if (toolTier != KnowledgeDefinition.ToolTier.BOW
&& toolTier != KnowledgeDefinition.ToolTier.CROSSBOW) {
toolTier = ToolTierHelper.fromItem(player.getOffHandStack());
}

// Will only grant XP if that tier is valid for the current knowledge tier
grantXpIfValidTool(player, rangedDef, toolTier);
Expand Down
18 changes: 10 additions & 8 deletions src/main/java/net/maxello/knowledgebound/mechanics/jobs/SlaughteringManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,16 @@ private static void registerDissectionInteraction() {
}

// Actually roll the dice and generate the loot
performDissection(serverPlayer, entity, isCleaver, cfg);
performDissection(serverPlayer, entity, isCleaver, cfg, hand);

// Cancel further processing so they don't accidentally ride the dead horse or milk the dead cow
return ActionResult.SUCCESS;
});
}

private static void performDissection(ServerPlayerEntity player, Entity corpse,
boolean usedCleaver, KnowledgeBoundConfig cfg) {
boolean usedCleaver, KnowledgeBoundConfig cfg,
net.minecraft.util.Hand hand) {
if (!(corpse.getWorld() instanceof ServerWorld serverWorld)) return;

int slaughterTier = PlayerKnowledgeManager.getTier(player, KnowledgeRegistry.SLAUGHTERING_ID);
Expand All @@ -267,7 +268,7 @@ private static void performDissection(ServerPlayerEntity player, Entity corpse,
double failRoll = RANDOM.nextDouble();

if (failRoll < failChance) {
handleFailedDissection(player, corpse, serverWorld, cfg);
handleFailedDissection(player, corpse, serverWorld, cfg, hand);
return;
}

Expand Down Expand Up @@ -319,9 +320,9 @@ private static void performDissection(ServerPlayerEntity player, Entity corpse,
10, 0.3, 0.3, 0.3, 0.02);

// Take durability off their tool
ItemStack held = player.getMainHandStack();
ItemStack held = player.getStackInHand(hand);
if (!held.isEmpty()) {
held.damage(1, player, LivingEntity.getSlotForHand(player.getActiveHand()));
held.damage(1, player, LivingEntity.getSlotForHand(hand));
}

// Give them XP for trying
Expand Down Expand Up @@ -351,7 +352,8 @@ private static double getFailChance(int tier, KnowledgeBoundConfig cfg) {
* Handle a failed dissection — drops 1 rotten flesh, plays an ugly sound, destroys corpse.
*/
private static void handleFailedDissection(ServerPlayerEntity player, Entity corpse,
ServerWorld serverWorld, KnowledgeBoundConfig cfg) {
ServerWorld serverWorld, KnowledgeBoundConfig cfg,
net.minecraft.util.Hand hand) {

// Toss out a single piece of rotten flesh as a consolation prize
ItemStack rottenFlesh = new ItemStack(Items.ROTTEN_FLESH, 1);
Expand All @@ -371,9 +373,9 @@ private static void handleFailedDissection(ServerPlayerEntity player, Entity cor
corpse.getX(), corpse.getY() + 0.5, corpse.getZ(),
15, 0.4, 0.3, 0.4, 0.03);

ItemStack held = player.getMainHandStack();
ItemStack held = player.getStackInHand(hand);
if (!held.isEmpty()) {
held.damage(1, player, LivingEntity.getSlotForHand(player.getActiveHand()));
held.damage(1, player, LivingEntity.getSlotForHand(hand));
}

// Even failing teaches you something!
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/maxello/knowledgebound/mixin/ScreenHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ public class ScreenHandlerMixin {
Identifier id = Registries.ITEM.getId(incoming.getItem());
SupervisedJob.JobType jt = SupervisedJobManager.getJobTypeForItem(id);
if (jt != null) {
net.maxello.knowledgebound.config.KnowledgeBoundConfig cfg = net.maxello.knowledgebound.config.KnowledgeBoundConfig.INSTANCE;
boolean jobEnabled = jt == SupervisedJob.JobType.SMELTING ? cfg.smeltingEnabled : cfg.cookingEnabled;
if (!jobEnabled) return;
// How many items are trying to be added?
Slot inputSlot = self.slots.get(0);
int currentCount = inputSlot.hasStack() ? inputSlot.getStack().getCount() : 0;
Expand All @@ -195,6 +198,9 @@ public class ScreenHandlerMixin {
Identifier sourceItemId = Registries.ITEM.getId(sourceStack.getItem());
SupervisedJob.JobType jt = SupervisedJobManager.getJobTypeForItem(sourceItemId);
if (jt != null) {
net.maxello.knowledgebound.config.KnowledgeBoundConfig cfg = net.maxello.knowledgebound.config.KnowledgeBoundConfig.INSTANCE;
boolean jobEnabled = jt == SupervisedJob.JobType.SMELTING ? cfg.smeltingEnabled : cfg.cookingEnabled;
if (!jobEnabled) return;
// Check if there's already an item in the input slot
ItemStack currentInput = self.slots.get(0).getStack();
if (currentInput.isEmpty()) {
Expand Down