diff options
Diffstat (limited to 'src/mixin/java/gregtech')
4 files changed, 77 insertions, 1 deletions
diff --git a/src/mixin/java/gregtech/mixin/mixins/early/minecraft/CraftingManagerMixin.java b/src/mixin/java/gregtech/mixin/mixins/early/minecraft/CraftingManagerMixin.java index b21e9dcaed..23432792d0 100644 --- a/src/mixin/java/gregtech/mixin/mixins/early/minecraft/CraftingManagerMixin.java +++ b/src/mixin/java/gregtech/mixin/mixins/early/minecraft/CraftingManagerMixin.java @@ -8,7 +8,7 @@ import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import bartworks.ASM.BWCoreStaticReplacementMethodes; +import bartworks.hooks.BWCoreStaticReplacementMethodes; @Mixin(CraftingManager.class) public abstract class CraftingManagerMixin { diff --git a/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinDamageDropped.java b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinDamageDropped.java new file mode 100644 index 0000000000..4e68391a5e --- /dev/null +++ b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinDamageDropped.java @@ -0,0 +1,20 @@ +package gregtech.mixin.mixins.late.ic2; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(value = { ic2.core.block.machine.BlockMachine.class, ic2.core.block.generator.block.BlockGenerator.class }) +public class MixinDamageDropped extends Block { + + protected MixinDamageDropped(Material materialIn) { + super(materialIn); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + +} diff --git a/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinHarvestTool.java b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinHarvestTool.java new file mode 100644 index 0000000000..39fca0c5c6 --- /dev/null +++ b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinHarvestTool.java @@ -0,0 +1,31 @@ +package gregtech.mixin.mixins.late.ic2; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +import org.spongepowered.asm.mixin.Mixin; + +@Mixin( + value = { ic2.core.block.BlockTileEntity.class, ic2.core.block.machine.BlockMachine.class, + ic2.core.block.machine.BlockMachine2.class, ic2.core.block.machine.BlockMachine3.class, + ic2.core.block.kineticgenerator.block.BlockKineticGenerator.class, + ic2.core.block.heatgenerator.block.BlockHeatGenerator.class, + ic2.core.block.generator.block.BlockGenerator.class, ic2.core.block.reactor.block.BlockReactorAccessHatch.class, + ic2.core.block.reactor.block.BlockReactorChamber.class, + ic2.core.block.reactor.block.BlockReactorFluidPort.class, + ic2.core.block.reactor.block.BlockReactorRedstonePort.class, + ic2.core.block.reactor.block.BlockReactorVessel.class, ic2.core.block.personal.BlockPersonal.class, + ic2.core.block.wiring.BlockChargepad.class, ic2.core.block.wiring.BlockElectric.class, + ic2.core.block.wiring.BlockLuminator.class }) +public class MixinHarvestTool extends Block { + + protected MixinHarvestTool(Material materialIn) { + super(materialIn); + } + + @Override + public String getHarvestTool(int aMeta) { + return "wrench"; + } + +} diff --git a/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinItemDropped.java b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinItemDropped.java new file mode 100644 index 0000000000..d3dc2eee95 --- /dev/null +++ b/src/mixin/java/gregtech/mixin/mixins/late/ic2/MixinItemDropped.java @@ -0,0 +1,25 @@ +package gregtech.mixin.mixins.late.ic2; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; + +import org.spongepowered.asm.mixin.Mixin; + +@Mixin( + value = { ic2.core.block.machine.BlockMachine2.class, ic2.core.block.machine.BlockMachine3.class, + ic2.core.block.wiring.BlockElectric.class }) +public class MixinItemDropped extends Block { + + protected MixinItemDropped(Material materialIn) { + super(materialIn); + } + + @Override + public Item getItemDropped(int meta, Random random, int fortune) { + return Item.getItemFromBlock((Block) (Object) this); + } + +} |