Merge branch '1.10.x'

CrafterKina · CrafterKina · commit 4f434094e650 · 2016-07-30T17:36:59.000+09:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Minecraft Mod Cooperation API [![Join the chat at https://gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI](https://badges.gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI.svg)](https://gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 本APIは食べ物や色といった各modで内容が共通しやすいInterfaceやEnumerationを定義し、modderに提供する事で、mod間の連携を容易にすることを目的とします。
-現在は、Minecraft1.7.10のMinecraftForge10.13.4.1558以上の環境で動作させることを想定してコーディングされています。
+現在は、Minecraft1.9のMinecraftForge12.16.0.1766以上の環境で動作させることを想定してコーディングされています。
 
 ## License
 LICENSEという名前のファイルを見てください。
@@ -12,7 +12,7 @@ Licenseはこのリポジトリに対してAdmin以上の権限を持ってい
 
 # Minecraft Mod Cooperation API [![Join the chat at https://gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI](https://badges.gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI.svg)](https://gitter.im/MinecraftModderJapan/MinecraftModCooperationAPI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 This API will be used to make your mods to work with other mods easily.
-Now work on Minecraft1.7.10 and upper MinecraftForge10.13.4.1558.
+Now work on Minecraft1.9 and upper MinecraftForge12.16.0.1766.
 
 ## License
 See the LICENSE file.
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/ModCooperationAPI.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/ModCooperationAPI.java
@@ -1,6 +1,6 @@
 package jp.MinecraftModderJapan.ModCooperationAPI;
 
-import cpw.mods.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod;
 
 @Mod(modid = ModCooperationAPI.MOD_ID)
 public class ModCooperationAPI{
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/EnumDyeColor.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/EnumDyeColor.java
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/block/ICrop.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/block/ICrop.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import java.util.Random;
@@ -12,7 +13,7 @@
  * Crop interface.
  *
  * @author CrafterKina
- * @version 1.0
+ * @version 1.1
  * @since 1.0
  */
 public interface ICrop{
@@ -26,15 +27,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    boolean isMature(World world, int x, int y, int z);
+    boolean isMature(World world, BlockPos pos);
 
     /**
      * 作物から何らかの収穫が得られるときは、trueを返します。
@@ -45,15 +44,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    boolean isHarvestable(World world, int x, int y, int z);
+    boolean isHarvestable(World world, BlockPos pos);
 
     /**
      * 収穫者がこの作物を収穫できるか判定します。
@@ -68,15 +65,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    boolean canHarvestCrop(EntityPlayer player, World world, int x, int y, int z);
+    boolean canHarvestCrop(EntityPlayer player, World world, BlockPos pos);
 
     /**
      * 成長段階を一つ進めます。 それ以上成長できない場合、falseを返し何も行いません。
@@ -87,15 +82,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    boolean grow(World world, int x, int y, int z);
+    boolean grow(World world, BlockPos pos);
 
     /**
      * 作物の種を返します。
@@ -106,15 +99,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    ItemStack getSeed(World world, int x, int y, int z);
+    ItemStack getSeed(World world, BlockPos pos);
 
     /**
      * 期待されるすべての収穫物を返します。
@@ -125,15 +116,13 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    ItemStack[] getAllExceptedResult(World world, int x, int y, int z);
+    ItemStack[] getAllExceptedResult(World world, BlockPos pos);
 
     /**
      * 収穫結果を返します。ドロップ処理等は行いません。
@@ -152,14 +141,12 @@ public interface ICrop{
      *         Nonnull
      *         <p/>
      *         the World
-     * @param x
-     *         X
-     * @param y
-     *         Y
-     * @param z
-     *         Z
+     * @param pos
+     *         Nonnull
+     *         <p/>
+     *         position
      * @since 1.0
      */
-    ItemStack[] harvest(EntityPlayer player, Random random, World world, int x, int y, int z);
+    ItemStack[] harvest(EntityPlayer player, Random random, World world, BlockPos pos);
 
 }
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/block/package-info.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/block/package-info.java
@@ -1,4 +1,4 @@
-@API(apiVersion = "1.0", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api.block")
+@API(apiVersion = "1.1", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api.block")
 package jp.MinecraftModderJapan.ModCooperationAPI.api.block;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/entity/package-info.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/entity/package-info.java
@@ -1,4 +1,4 @@
 @API(apiVersion = "1.0", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api.entity")
 package jp.MinecraftModderJapan.ModCooperationAPI.api.entity;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/item/package-info.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/item/package-info.java
@@ -1,4 +1,4 @@
 @API(apiVersion = "1.0", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api.item")
 package jp.MinecraftModderJapan.ModCooperationAPI.api.item;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
diff --git a/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/package-info.java b/src/main/java/jp/MinecraftModderJapan/ModCooperationAPI/api/package-info.java
@@ -1,4 +1,4 @@
-@API(apiVersion = "1.0", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api")
+@API(apiVersion = "1.1", owner = "jp.MinecraftModderJapan.ModCooperationAPI", provides = "jp.MinecraftModderJapan.ModCooperationAPI.api")
 package jp.MinecraftModderJapan.ModCooperationAPI.api;
 
-import cpw.mods.fml.common.API;
+import net.minecraftforge.fml.common.API;
