From d6f2ed30e5f61aec259bbdfc706241377e2abfed Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Tue, 31 Jan 2023 16:52:00 -0300 Subject: [PATCH] make them bauble trinkets --- gradle/scripts/dependencies.gradle | 5 +-- .../tools/powered/ToolWirelessTerminal.java | 37 ++++++++++++++++--- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index a68a2c5ed..ed201c44f 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -23,12 +23,10 @@ repositories { url "https://cursemaven.com" } - /* maven { name = "CurseForge" url = "https://minecraft.curseforge.com/api/maven/" } - */ maven { name "Mobius" @@ -87,11 +85,12 @@ dependencies { compileOnly "curse.maven:chisel-235279:2915375" + deobfCompile "baubles:Baubles:1.12:1.5.2" //mods "mcp.mobius.waila:Hwyla:${hwyla_version}" mods "curse.maven:hwyla-253449:2568751" mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev" mods "mcjty.theoneprobe:TheOneProbe-${minecraft_version}:${top_version}" - + // compile against provided APIs compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api" //compileOnly "mcp.mobius.waila:Hwyla:${hwyla_version}" diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index eafdf6895..48430ac6d 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -32,8 +32,11 @@ import appeng.items.materials.ItemMaterial; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; import appeng.util.Platform; +import baubles.api.BaubleType; +import baubles.api.IBauble; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -45,6 +48,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -52,8 +56,9 @@ import net.minecraftforge.items.ItemStackHandler; import java.util.List; +@Optional.Interface(iface = "baubles.api.IBauble", modid = "baubles") -public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler { +public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler, IBauble { int magnetTick; @@ -146,6 +151,31 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { super.onUpdate(stack, worldIn, entityIn, itemSlot, isSelected); + if (Platform.isServer()) { + magnetLogic(stack, worldIn, entityIn); + } + } + + @Override + public IGuiHandler getGuiHandler(ItemStack is) { + return GuiBridge.GUI_WIRELESS_TERM; + } + + @Optional.Method(modid = "baubles") + @Override + public BaubleType getBaubleType(ItemStack itemStack) { + return BaubleType.TRINKET; + } + + @Optional.Method(modid = "baubles") + @Override + public void onWornTick(ItemStack itemstack, EntityLivingBase player) { + if (Platform.isServer()) { + magnetLogic(itemstack, player.world, player); + } + } + + public void magnetLogic(ItemStack stack, World worldIn, Entity entityIn) { if (entityIn instanceof EntityPlayer) { this.magnetTick++; if (magnetTick % 5 != 0) { @@ -205,9 +235,4 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless } } } - - @Override - public IGuiHandler getGuiHandler(ItemStack is) { - return GuiBridge.GUI_WIRELESS_TERM; - } }