From 029409c22ee812e5c146c4b18bb149d9eff1048f Mon Sep 17 00:00:00 2001
From: reobf <2215595288@qq.com>
Date: Wed, 18 Dec 2024 13:26:23 +0800
Subject: [PATCH] update

---
 dependencies.gradle                           |  5 +-
 .../item/ItemProgrammingToolkit.java          | 56 ++++++++++++++--
 .../proghatches/keybinding/KeyBindings.java   | 45 ++++++++++++-
 .../java/reobf/proghatches/main/MyMod.java    | 12 +++-
 .../proghatches/net/SwitchModeMessage.java    | 64 +++++++++++++++++++
 .../assets/proghatches/lang/en_US.lang        |  4 ++
 .../assets/proghatches/lang/zh_CN.lang        |  4 ++
 7 files changed, 181 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/reobf/proghatches/net/SwitchModeMessage.java

diff --git a/dependencies.gradle b/dependencies.gradle
index 4675759..bbf35f4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -34,7 +34,7 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-  api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.06:dev')
+  api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.06:dev'){ transitive = false }
   
   api("com.github.GTNewHorizons:StructureLib:1.4.0:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
@@ -54,8 +54,9 @@ dependencies {
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.7-GTNH:dev")
     compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15:dev")
     api('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
+	//api('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') {transitive=false}
     // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
+   // compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
 
     devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.10.0-GTNH:dev")
 
diff --git a/src/main/java/reobf/proghatches/item/ItemProgrammingToolkit.java b/src/main/java/reobf/proghatches/item/ItemProgrammingToolkit.java
index cc18ff9..e3d4b16 100644
--- a/src/main/java/reobf/proghatches/item/ItemProgrammingToolkit.java
+++ b/src/main/java/reobf/proghatches/item/ItemProgrammingToolkit.java
@@ -10,6 +10,7 @@
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
@@ -17,8 +18,12 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import reobf.proghatches.lang.LangManager;
 import reobf.proghatches.main.MyMod;
+import tconstruct.armor.player.TPlayerStats;
+import tconstruct.library.accessory.IAccessory;
 
 import com.google.common.collect.ImmutableList;
 import com.gtnewhorizons.modularui.api.ModularUITextures;
@@ -32,11 +37,19 @@
 
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
+//import baubles.api.expanded.IBaubleExpanded;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.modularui.GTUIInfos;
 
-public class ItemProgrammingToolkit extends Item implements IItemWithModularUI , IBauble {
+public class ItemProgrammingToolkit extends Item implements IItemWithModularUI , IBauble
+//,IAccessory
+
+//,IBaubleExpanded 
+{
 
 	/*
 	 * @Override public ModularWindow createWindow(UIBuildContext buildContext,
@@ -70,7 +83,7 @@ public IIcon getIconFromDamage(int p_77617_1_) {
 
 	@SideOnly(Side.CLIENT)
 	public static boolean holding() {
-		return lastholdingtick == Minecraft.getMinecraft().thePlayer.ticksExisted;
+		return Math.abs(lastholdingtick - Minecraft.getMinecraft().thePlayer.ticksExisted)<=2;
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -133,7 +146,7 @@ public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p
 
 	}
 
-	int maxModes = 3;
+	public static int maxModes = 3;
 
 	@Override
 	public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) {
@@ -318,7 +331,7 @@ protected int getTextColorOrDefault(String textType, int defaultColor) {
 	@Override
 	public BaubleType getBaubleType(ItemStack itemstack) {
 		
-		return BaubleType.AMULET;
+		return BaubleType.UNIVERSAL;
 	}
 
 	
@@ -352,4 +365,39 @@ public void onWornTick(ItemStack itemstack, EntityLivingBase player) {
 		  ((Item)i).onUpdate(itemstack, null, player, 0, false);
 	    }
 
+	   
+	   @SideOnly(Side.CLIENT)
+	   @SubscribeEvent
+	   public void event(LivingUpdateEvent e){
+		  if( e.entityLiving!=Minecraft.getMinecraft().thePlayer){return;}
+		   
+		   IInventory inventory = TPlayerStats.get((EntityPlayer) e.entityLiving).armor;
+		   
+		   for(int i=0;i<inventory.getSizeInventory();i++){
+			   
+			   ItemStack is = inventory.getStackInSlot(i);
+			   if(is!=null&&is.getItem() instanceof ItemProgrammingToolkit){
+			   ((Item)is.getItem()).onUpdate(is, null, e.entityLiving, 0, false);
+			   }
+		   }
+		   
+			
+	   }
+	   
+	 //  {MinecraftForge.EVENT_BUS.register(this);}
+	   
+	//@Override
+	public boolean canEquipAccessory(ItemStack item, int slot) {
+	
+		return true;
+	}
+
+/*	@Override
+	public String[] getBaubleTypes(ItemStack itemstack) {
+		// TODO Auto-generated method stub
+		return new String[]{
+				"universal"
+		};
+	}*/
+
 }
diff --git a/src/main/java/reobf/proghatches/keybinding/KeyBindings.java b/src/main/java/reobf/proghatches/keybinding/KeyBindings.java
index 3e6476c..70accd5 100644
--- a/src/main/java/reobf/proghatches/keybinding/KeyBindings.java
+++ b/src/main/java/reobf/proghatches/keybinding/KeyBindings.java
@@ -1,7 +1,50 @@
 package reobf.proghatches.keybinding;
 
+import cpw.mods.fml.client.registry.ClientRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.eventhandler.EventPriority;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.settings.KeyBinding;
+import reobf.proghatches.main.MyMod;
+import reobf.proghatches.net.SwitchModeMessage;
 
 public class KeyBindings {
-	  public static KeyBinding key = new KeyBinding("switch", 0, "programmable hatches key");
+
+	@SideOnly(Side.CLIENT)
+	public  KeyBinding key;
+
+	interface Run {
+		public default void run() {
+		}
+	}
+
+	 {
+
+		((Run) new Run() {
+			@SideOnly(Side.CLIENT)
+			@Override
+			public void run() {
+				key = new KeyBinding("proghatch.keybinding.kit.switch.desc", 0, "itemGroup.proghatches");
+				 ClientRegistry.registerKeyBinding(key);
+				 FMLCommonHandler.instance().bus().register(KeyBindings.this);
+			}
+		}).run();
+
+	}
+
+	@SideOnly(Side.CLIENT)
+	@SubscribeEvent(priority = EventPriority.HIGH, receiveCanceled = false)
+	public  void tick(final TickEvent.ClientTickEvent event) {
+		if (key.isPressed()) {
+
+			MyMod.net.sendToServer(new SwitchModeMessage());
+
+		}
+		;
+	}
+
 }
diff --git a/src/main/java/reobf/proghatches/main/MyMod.java b/src/main/java/reobf/proghatches/main/MyMod.java
index 4055f57..486339e 100644
--- a/src/main/java/reobf/proghatches/main/MyMod.java
+++ b/src/main/java/reobf/proghatches/main/MyMod.java
@@ -166,6 +166,7 @@
 import reobf.proghatches.gt.metatileentity.multi.LargeProgrammingCircuitProvider;
 import reobf.proghatches.item.ItemBookTutorial;
 import reobf.proghatches.item.ItemProgrammingCircuit;
+import reobf.proghatches.keybinding.KeyBindings;
 import reobf.proghatches.lang.LangManager;
 import reobf.proghatches.main.mixin.mixins.MixinFixPipeCoverBug;
 import reobf.proghatches.main.registration.Registration;
@@ -175,6 +176,7 @@
 import reobf.proghatches.net.OpenPartGuiMessage;
 import reobf.proghatches.net.PriorityMessage;
 import reobf.proghatches.net.RenameMessage;
+import reobf.proghatches.net.SwitchModeMessage;
 import reobf.proghatches.net.UpgradesMessage;
 import reobf.proghatches.net.VoidFXMessage;
 import reobf.proghatches.net.WayPointMessage;
@@ -294,7 +296,7 @@ public void preInit(FMLPreInitializationEvent event) {
 		net.registerMessage(new VoidFXMessage.Handler(), VoidFXMessage.class, 6, Side.CLIENT);
 		net.registerMessage(new ConnectionModeMessage.Handler(), ConnectionModeMessage.class, 7, Side.SERVER);
 		net.registerMessage(new MAFXMessage.Handler(), MAFXMessage.class, 8, Side.CLIENT);
-		
+		net.registerMessage(new SwitchModeMessage.Handler(), SwitchModeMessage.class, 9, Side.SERVER);
 		proxy.preInit(event);
 	}
 
@@ -308,7 +310,7 @@ public void preInit(FMLPreInitializationEvent event) {
 	public void init(FMLInitializationEvent event) {
 		proxy.init(event);
 		
-		
+		new KeyBindings();
 		
 		AEApi.instance().partHelper().registerNewLayer("reobf.proghatches.fmp.LazerLayer",
 				"reobf.proghatches.eucrafting.ILazer");
@@ -407,8 +409,14 @@ public void join(PlayerLoggedInEvent e) {
 
 	public void postInit(FMLPostInitializationEvent event) {
 		proxy.postInit(event);
+		//KeyBindings
+		
+		
+		
+		
 		
 		
+		//MinecraftForge.EVENT_BUS.register(this);
 		// Api.INSTANCE.registries().p2pTunnel().addNewAttunement(null, null);
 		// ShutDownReasonRegistry.register(ACCESS_LOOP);
 		NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
diff --git a/src/main/java/reobf/proghatches/net/SwitchModeMessage.java b/src/main/java/reobf/proghatches/net/SwitchModeMessage.java
new file mode 100644
index 0000000..54357b8
--- /dev/null
+++ b/src/main/java/reobf/proghatches/net/SwitchModeMessage.java
@@ -0,0 +1,64 @@
+package reobf.proghatches.net;
+
+import baubles.api.BaublesApi;
+import cpw.mods.fml.common.network.simpleimpl.IMessage;
+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
+import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+import reobf.proghatches.item.ItemProgrammingToolkit;
+import tconstruct.armor.player.TPlayerStats;
+
+public class SwitchModeMessage implements IMessage {
+	
+	
+	public SwitchModeMessage(){}
+	public static class Handler implements IMessageHandler<SwitchModeMessage, SwitchModeMessage> {
+
+		@Override
+		public SwitchModeMessage onMessage(SwitchModeMessage message, MessageContext ctx) {
+		
+		IInventory[] invs = 
+			{TPlayerStats.get(((NetHandlerPlayServer)ctx.netHandler).playerEntity).armor,
+				BaublesApi.getBaubles(((NetHandlerPlayServer)ctx.netHandler).playerEntity)
+			};
+	
+		for(IInventory inv:invs)
+		for(int i=0;i<inv.getSizeInventory();i++){
+			ItemStack is = inv.getStackInSlot(i);
+			if(is!=null&&is.getItem() instanceof ItemProgrammingToolkit){
+				is.setItemDamage((is.getItemDamage() + 1) % ItemProgrammingToolkit.maxModes);
+				((NetHandlerPlayServer)ctx.netHandler).playerEntity.addChatMessage(new 
+						
+						ChatComponentTranslation("proghatch.keybinding.kit.switch.mode."+(is.getItemDamage()))
+						);
+				break;
+				//((ItemProgrammingToolkit)is.getItem()).onItemRightClick(is, null, null);
+			}
+			
+		}
+		return null;
+	
+		}
+	}
+
+	@Override
+	public void fromBytes(ByteBuf buf) {
+		
+		
+	}
+
+	@Override
+	public void toBytes(ByteBuf buf) {
+	
+		
+	}
+
+	
+
+}
diff --git a/src/main/resources/assets/proghatches/lang/en_US.lang b/src/main/resources/assets/proghatches/lang/en_US.lang
index f8d98b5..cfb48c2 100644
--- a/src/main/resources/assets/proghatches/lang/en_US.lang
+++ b/src/main/resources/assets/proghatches/lang/en_US.lang
@@ -713,3 +713,7 @@ item.proghatch.upgrades.tooltips.3.1=Unlock Infinity Buffer Mode, for non-ME hat
 item.proghatch.upgrades.tooltips.3.2=Harvest the Hatch to retrieve installed Upgrades.
 item.proghatch.upgrades.3=Infinity Buffer Upgrade
 proghatch.gui.button.power_switch.ex=§cShift-Click to open experimental option panel.
+proghatch.keybinding.kit.switch.mode.0=Mode 1: Disabled
+proghatch.keybinding.kit.switch.mode.1=Mode 2: Normal
+proghatch.keybinding.kit.switch.mode.2=Mode 3: Normal + Reset Circuit
+proghatch.keybinding.kit.switch.desc=Switch Toolkit Mode (equipped in Baubles slot)
diff --git a/src/main/resources/assets/proghatches/lang/zh_CN.lang b/src/main/resources/assets/proghatches/lang/zh_CN.lang
index 63bed30..dbfa901 100644
--- a/src/main/resources/assets/proghatches/lang/zh_CN.lang
+++ b/src/main/resources/assets/proghatches/lang/zh_CN.lang
@@ -711,3 +711,7 @@ item.proghatch.upgrades.tooltips.3.1=为非ME仓解锁无尽缓冲模式
 item.proghatch.upgrades.tooltips.3.2=拆卸输入仓回收已安装的升级
 item.proghatch.upgrades.3=无尽缓冲升级
 proghatch.gui.button.power_switch.ex=§cShift点击打开实验性功能选项窗口
+proghatch.keybinding.kit.switch.mode.0=模式 1: 禁用
+proghatch.keybinding.kit.switch.mode.1=模式 2: 常规
+proghatch.keybinding.kit.switch.mode.2=模式 3: 常规+重置电路
+proghatch.keybinding.kit.switch.desc=切换编程工具箱模式(装备在Baubles饰品栏)