GeminiのRV対応

Author: tier940

…try/farming/FarmableGTRubberSapling.java …restry/farming/FarmableGTCEuSapling.javasrc/main/java/com/github/gtexpert/gtbm/integration/forestry/farming/FarmableGTRubberSapling.java renamed to src/main/java/com/github/gtexpert/gtbm/integration/forestry/farming/FarmableGTCEuSapling.java src/main/java/com/github/gtexpert/gtbm/integration/forestry/farming/FarmableGTRubberSapling.java renamed to src/main/java/com/github/gtexpert/gtbm/integration/forestry/farming/FarmableGTCEuSapling.java

@@ -22,13 +22,13 @@
 import forestry.core.utils.NetworkUtil;
 import forestry.farming.logic.crops.CropDestroy;
 
-public class FarmableGTRubberSapling implements IFarmable {
+public class FarmableGTCEuSapling implements IFarmable {
 
     private final Block saplingBlock;
     private final ItemStack germling;
     private final ItemStack[] windfall;
 
-    public FarmableGTRubberSapling(Block saplingBlock, ItemStack[] windfall) {
+    public FarmableGTCEuSapling(Block saplingBlock, ItemStack[] windfall) {
         this.saplingBlock = saplingBlock;
         this.germling = new ItemStack(saplingBlock);
         this.windfall = windfall;
@@ -72,18 +72,22 @@ public boolean isWindfall(ItemStack itemstack) {
 
     @Override
     public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) {
-        ItemStack copy = germling.copy();
-        player.setHeldItem(EnumHand.MAIN_HAND, copy);
-        EnumActionResult result = copy.onItemUse(player, world, pos.down(),
-                EnumHand.MAIN_HAND, EnumFacing.UP, 0, 0, 0);
-        player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
-        if (result == EnumActionResult.SUCCESS) {
-            PacketFXSignal packet = new PacketFXSignal(
-                    PacketFXSignal.SoundFXType.BLOCK_PLACE, pos,
-                    Blocks.SAPLING.getDefaultState());
-            NetworkUtil.sendNetworkPacket(packet, pos, world);
-            return true;
+        ItemStack originalHeldItem = player.getHeldItem(EnumHand.MAIN_HAND);
+        try {
+            ItemStack copy = germling.copy();
+            player.setHeldItem(EnumHand.MAIN_HAND, copy);
+            EnumActionResult result = copy.onItemUse(player, world, pos.down(),
+                    EnumHand.MAIN_HAND, EnumFacing.UP, 0, 0, 0);
+            if (result == EnumActionResult.SUCCESS) {
+                PacketFXSignal packet = new PacketFXSignal(
+                        PacketFXSignal.SoundFXType.BLOCK_PLACE, pos,
+                        Blocks.SAPLING.getDefaultState());
+                NetworkUtil.sendNetworkPacket(packet, pos, world);
+                return true;
+            }
+            return false;
+        } finally {
+            player.setHeldItem(EnumHand.MAIN_HAND, originalHeldItem);
         }
-        return false;
     }
 }

src/main/java/com/github/gtexpert/gtbm/integration/forestry/loaders/FFMFarmingLoader.java

@@ -6,7 +6,7 @@
 import gregtech.common.items.MetaItems;
 
 import com.github.gtexpert.gtbm.integration.forestry.farming.FarmLogicCEu;
-import com.github.gtexpert.gtbm.integration.forestry.farming.FarmableGTRubberSapling;
+import com.github.gtexpert.gtbm.integration.forestry.farming.FarmableGTCEuSapling;
 import com.github.gtexpert.gtbm.integration.forestry.util.ForestryFarmHelper;
 
 import forestry.api.core.ForestryAPI;
@@ -26,7 +26,7 @@ public static void init() {
         String rubberId = "farmCEu.rubber";
         ceuFarm.registerFarmables(rubberId);
         farmRegistry.registerFarmables(rubberId,
-                new FarmableGTRubberSapling(MetaBlocks.RUBBER_SAPLING,
+                new FarmableGTCEuSapling(MetaBlocks.RUBBER_SAPLING,
                         new ItemStack[] { MetaItems.STICKY_RESIN.getStackForm() }));
 
         // GregTech Fertilizer

src/main/java/com/github/gtexpert/gtbm/integration/gtfo/farming/FarmableGTFOSapling.java

@@ -72,18 +72,22 @@ public boolean isWindfall(ItemStack itemstack) {
 
     @Override
     public boolean plantSaplingAt(EntityPlayer player, ItemStack germling, World world, BlockPos pos) {
-        ItemStack copy = germling.copy();
-        player.setHeldItem(EnumHand.MAIN_HAND, copy);
-        EnumActionResult result = copy.onItemUse(player, world, pos.down(),
-                EnumHand.MAIN_HAND, EnumFacing.UP, 0, 0, 0);
-        player.setHeldItem(EnumHand.MAIN_HAND, ItemStack.EMPTY);
-        if (result == EnumActionResult.SUCCESS) {
-            PacketFXSignal packet = new PacketFXSignal(
-                    PacketFXSignal.SoundFXType.BLOCK_PLACE, pos,
-                    Blocks.SAPLING.getDefaultState());
-            NetworkUtil.sendNetworkPacket(packet, pos, world);
-            return true;
+        ItemStack originalHeldItem = player.getHeldItem(EnumHand.MAIN_HAND);
+        try {
+            ItemStack copy = germling.copy();
+            player.setHeldItem(EnumHand.MAIN_HAND, copy);
+            EnumActionResult result = copy.onItemUse(player, world, pos.down(),
+                    EnumHand.MAIN_HAND, EnumFacing.UP, 0, 0, 0);
+            if (result == EnumActionResult.SUCCESS) {
+                PacketFXSignal packet = new PacketFXSignal(
+                        PacketFXSignal.SoundFXType.BLOCK_PLACE, pos,
+                        Blocks.SAPLING.getDefaultState());
+                NetworkUtil.sendNetworkPacket(packet, pos, world);
+                return true;
+            }
+            return false;
+        } finally {
+            player.setHeldItem(EnumHand.MAIN_HAND, originalHeldItem);
         }
-        return false;
     }
 }