• R/O
  • SSH

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

前提Mod: Minecraft1.7.10 IC2Exp


Commit MetaInfo

Revision30e601e8180d9bfaf58b28fbd708f5bf5e618abb (tree)
Time2015-08-06 12:55:56
AuthorMirrgieRiana
CommiterMirrgieRiana

Log Message

InitializerCrops: 多くの作物にBaseSeedを追加

Change Summary

Incremental Difference

diff -r 747dacafa620 -r 30e601e8180d MirageCrops6/src/main/java/miragecrops6/InitializerCrops.java
--- a/MirageCrops6/src/main/java/miragecrops6/InitializerCrops.java Thu Aug 06 12:54:45 2015 +0900
+++ b/MirageCrops6/src/main/java/miragecrops6/InitializerCrops.java Thu Aug 06 12:55:56 2015 +0900
@@ -13,6 +13,7 @@
1313 import miragecrops6.alis.AliItemStack;
1414 import miragecrops6.crop.CropCardMirageCrops;
1515 import miragecrops6.crop.CropCardMirageCrops.CropCardMirageCropsParameter;
16+import mirrg.minecraft.itemstack.mir60.HItemStack;
1617 import mirrg.struct.hydrogen.Tuple;
1718 import net.minecraft.entity.EnumCreatureAttribute;
1819 import net.minecraft.entity.monster.EntityZombie;
@@ -41,23 +42,36 @@
4142 CropCardMirageCrops c;
4243 String a1 = "Spinach";
4344 String a2 = "SpinachGroup";
45+
4446 c = r("spinach", 2, 4, s(0, 4, 0, 1, 0), a(a1, a2, "Food", "Edible"));
4547 setGain(c, cropTile -> AliItemStack.cropSpinach.copy());
48+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinach, 4));
49+
4650 c = r("spinachRed", 3, 4, s(2, 2, 0, 3, 0), a(a1, a2, "Red", "Undead", "Blood"));
4751 setGain(c, cropTile -> AliItemStack.cropSpinachRed.copy());
4852 setTextureRespect(c, max(3), AliCrop.spinach);
53+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinachRed, 4));
54+
4955 c = r("spinachBlue", 5, 4, s(4, 1, 0, 3, 0), a(a1, a2, "Blue", "Magic"));
5056 setGain(c, cropTile -> AliItemStack.cropSpinachBlue.copy());
5157 setTextureRespect(c, max(3), AliCrop.spinach);
58+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinachBlue, 4));
59+
5260 c = r("spinachPoison", 8, 4, s(6, 0, 4, 1, 0), a(a1, a2, "Purple", "Poizon", "Toxic"));
5361 setGain(c, cropTile -> AliItemStack.cropSpinachPoison.copy());
5462 setTextureRespect(c, max(3), AliCrop.spinach);
63+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinachPoison, 4));
64+
5565 c = r("spinachFire", 10, 4, s(2, 0, 6, 1, 0), a(a1, a2, "Orange", "Fire", "Flame"));
5666 setGain(c, cropTile -> AliItemStack.cropSpinachFire.copy());
5767 setTextureRespect(c, max(3), AliCrop.spinach);
68+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinachFire, 4));
69+
5870 c = r("spinachIce", 12, 4, s(1, 1, 1, 1, 0), a(a1, a2, "White", "Blue", "Ice"));
5971 setGain(c, cropTile -> AliItemStack.cropSpinachIce.copy());
6072 setTextureRespect(c, max(3), AliCrop.spinach);
73+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropSpinachIce, 4));
74+
6175 }
6276
6377 private static void registerSarracenias()
@@ -211,11 +225,13 @@
211225 c = r("cactus", 2, 4, s(1, 0, 4, 4, 1), a(a1, a2, "Green"));
212226 setGain(c, cropTile -> AliItemStack.cropCactus.copy());
213227 addCropComponentCactus(c, array(4), COLLISION, 1.0f);
228+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropCactus, 1));
214229
215230 c = r("cactusObsidian", 7, 4, s(3, 0, 6, 3, 0), a(a1, a2, "Purple", "Black", "Obsidian", "Glass", "Fire"));
216231 setGain(c, cropTile -> AliItemStack.cropCactusObsidian.copy());
217232 setTextureRespect(c, max(3), AliCrop.cactus);
218233 addCropComponentCactus(c, array(4), COLLISION, 2.0f);
234+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropCactusObsidian, 1));
219235
220236 c = r("cactusSnow", 6, 5, s(2, 0, 5, 2, 0), a(a1, a2, "White", "Ice", "Snow"));
221237 setGain(c, cropTile -> w()
@@ -229,6 +245,7 @@
229245 setTextureRespect(c, max(3), AliCrop.cactus);
230246 addCropComponentCactus(c, array(4, 5), COLLISION | CLICK, 1.0f);
231247 addCropComponentSlow(c, array(5), COLLISION);
248+ registerBaseSeed(c, () -> HItemStack.copy(AliItemStack.cropCactusSnow, 1));
232249 }
233250
234251 private static void registerWeeds()
@@ -242,6 +259,7 @@
242259
243260 c = r("fern", 1, 4, s(0, 0, 0, 1, 4), a(a1, a2, a5, "Weed"));
244261 setGain(c, cropTile -> new ItemStack(Blocks.tallgrass, 1, 2));
262+ registerBaseSeed(c, () -> new ItemStack(Blocks.tallgrass, 1, 2));
245263
246264 c = r("fernHoney", 5, 5, s(0, 3, 0, 1, 2), a(a1, a2, a5, "Bee", "Honey", "Edible"));
247265 setGain(c, cropTile -> null);
@@ -254,6 +272,7 @@
254272
255273 c = r("vine", 1, 4, s(0, 0, 1, 0, 4), a(a3, a4, a5, "Weed"));
256274 setGain(c, cropTile -> new ItemStack(Blocks.vine));
275+ registerBaseSeed(c, () -> new ItemStack(Blocks.vine));
257276
258277 c = r("vineApatite", 6, 4, s(3, 0, 0, 2, 1), a(a3, a4, a5, "Blue", "Apatite", "Crystal", "Phosphorus"));
259278 setGain(c, cropTile -> w()
@@ -385,4 +404,9 @@
385404 return cropTile.getWorld().rand.nextInt(max - min + 1) + min;
386405 }
387406
407+ private static void registerBaseSeed(CropCardMirageCrops cropCardMirageCrops, Supplier<ItemStack> itemStack)
408+ {
409+ Crops.instance.registerBaseSeed(itemStack.get(), cropCardMirageCrops, 1, 0, 0, 0);
410+ }
411+
388412 }