Skip to content
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.

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

Fix Effortless Building only being able to use the stack in hand #614

Merged
merged 3 commits into from
Jan 14, 2025
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class UTMixinLoader implements ILateMixinLoader
put("mixins.mods.collective.json", () -> loaded("collective"));
put("mixins.mods.compactmachines.spawns.json", () -> loaded("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utAllowedSpawnsImprovementToggle);
put("mixins.mods.cqrepoured.json", () -> loaded("cqrepoured"));
put("mixins.mods.effortlessbuilding.json", () -> loaded("effortlessbuilding"));
put("mixins.mods.effortlessbuilding.json", () -> loaded("effortlessbuilding") && UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle);
put("mixins.mods.elementarystaffs.json", () -> loaded("element"));
put("mixins.mods.elenaidodge2.json", () -> loaded("elenaidodge2"));
put("mixins.mods.enderio.chorus.json", () -> loaded("enderio") && UTConfigMods.ENDER_IO.utChorusStackOverflow);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
package mod.acgaming.universaltweaks.mods.effortlessbuilding.mixin;

import net.minecraft.block.state.IBlockState;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;


import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;

import nl.requios.effortlessbuilding.compatibility.CompatHelper;
import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;

import static nl.requios.effortlessbuilding.compatibility.CompatHelper.dankNullItem;

@Mixin(CompatHelper.class)
public class UTCompatHelperMixin
{
/**
* @author Irgendwer01
* @reason Fix EB ignoring metadata
*/
@Overwrite(remap = false)
public static ItemStack getItemBlockByState(ItemStack stack, IBlockState state)
{
int meta = state.getBlock().damageDropped(state);
ItemStack blockStack = new ItemStack(state.getBlock(), 1, meta);
if (stack.getItem() instanceof ItemBlock && stack.getMetadata() == meta)
{
return stack;
}
if (stack.getItem() instanceof ItemRandomizerBag)
{
IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(stack);
for(int i = 0; i < bagInventory.getSlots(); ++i)
{
ItemStack bagStack = bagInventory.getStackInSlot(i);
if (!bagStack.isEmpty() && stack.isItemEqual(blockStack))
{
return stack;
}
}
}
if (stack.getItem() == dankNullItem)
{
IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);

for(int i = 0; i < handler.getSlots(); ++i)
{
ItemStack ref = handler.getStackInSlot(i);
if (ref.getItem() instanceof ItemBlock && ref.isItemEqual(blockStack))
{
return (stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)).getStackInSlot(i);
}
}
}
return ItemStack.EMPTY;
}

}

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/mixins.mods.effortlessbuilding.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"refmap": "universaltweaks.refmap.json",
"minVersion": "0.8",
"compatibilityLevel": "JAVA_8",
"mixins": ["UTInventoryHelperMixin", "UTSurvivalHelperMixin", "UTUndoRedoMixin"]
"mixins": ["UTCompatHelperMixin", "UTUndoRedoMixin"]
}
Loading