• R/O
  • SSH

コミット

よく使われているワード(クリックで追加)

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

前提Mod: Minecraft1.7.10 IC2Exp


コミットメタ情報

リビジョンe2f0afcf294c1d8767048478fd3f1dbf675531dd (tree)
日時2015-08-06 18:24:24
作者MirrgieRiana
コミッターMirrgieRiana

ログメッセージ

remove: metaItem(circuitBasic), 鉱石辞書でIC2のアイテムを直接出すことにきりかえ

変更サマリ

差分

diff -r 416da0040fae -r e2f0afcf294c MirageCrops6/src/main/java/miragecrops6/LoaderItemMultiCrops.java
--- a/MirageCrops6/src/main/java/miragecrops6/LoaderItemMultiCrops.java Thu Aug 06 18:23:24 2015 +0900
+++ b/MirageCrops6/src/main/java/miragecrops6/LoaderItemMultiCrops.java Thu Aug 06 18:24:24 2015 +0900
@@ -8,6 +8,7 @@
88 import mirrg.minecraft.item.multi.copper.ItemMulti;
99 import mirrg.minecraft.item.multi.copper.Metaitem;
1010 import mirrg.minecraft.itemstack.mir60.HItemStack;
11+import mirrg.minecraft.itemstack.mir60.HOreDictionary;
1112 import net.minecraft.init.Blocks;
1213 import net.minecraft.init.Items;
1314 import net.minecraft.item.ItemStack;
@@ -77,17 +78,21 @@
7778
7879 addMetaitem(multiCrops, i++, "cropReedCircuit", true);
7980 mod.onPostInit.add(() -> {
80- GameRegistry.addRecipe(new ShapelessOreRecipe(
81- AliItemStack.circuitBasic,
82- AliItemStack.cropReedCircuit));
81+ HOreDictionary.findFirst("circuitBasic", ore -> {
82+ GameRegistry.addRecipe(new ShapelessOreRecipe(
83+ ore,
84+ AliItemStack.cropReedCircuit));
85+ });
8386 });
8487
8588 addMetaitem(multiCrops, i++, "cropReedWire", true);
86- //onInit.add(() -> {
87- // OreDictionary.registerOre("wireCoveredCopper", AliItemStack.cropReedWire);
88- //}); // TODO
89-
90- addMetaitem(multiCrops, i++, "circuitBasic", true);
89+ mod.onPostInit.add(() -> {
90+ HOreDictionary.findFirst("craftingWireCopper", ore -> {
91+ GameRegistry.addRecipe(new ShapelessOreRecipe(
92+ ore,
93+ AliItemStack.cropReedWire));
94+ });
95+ });
9196
9297 }
9398 {
diff -r 416da0040fae -r e2f0afcf294c MirageCrops6/src/main/java/miragecrops6/alis/AliItemStack.java
--- a/MirageCrops6/src/main/java/miragecrops6/alis/AliItemStack.java Thu Aug 06 18:23:24 2015 +0900
+++ b/MirageCrops6/src/main/java/miragecrops6/alis/AliItemStack.java Thu Aug 06 18:24:24 2015 +0900
@@ -31,7 +31,6 @@
3131 // 300
3232 cropReedCircuit,
3333 cropReedWire,
34- circuitBasic,
3534 cropWartGlass,
3635 dustGlass,
3736
diff -r 416da0040fae -r e2f0afcf294c MirageCrops6/src/main/resources/assets/miragecrops6/lang/en_US.lang
--- a/MirageCrops6/src/main/resources/assets/miragecrops6/lang/en_US.lang Thu Aug 06 18:23:24 2015 +0900
+++ b/MirageCrops6/src/main/resources/assets/miragecrops6/lang/en_US.lang Thu Aug 06 18:24:24 2015 +0900
@@ -66,7 +66,6 @@
6666
6767 item.cropReedCircuit.name=Reed Circuit
6868 item.cropReedWire.name=Reed Wire
69-item.circuitBasic.name=Basic Circuit
7069
7170 item.cropWartGlass.name=Glass Wart
7271 item.dustGlass.name=Glass Dust
diff -r 416da0040fae -r e2f0afcf294c MirageCrops6/src/main/resources/assets/miragecrops6/lang/ja_JP.lang
--- a/MirageCrops6/src/main/resources/assets/miragecrops6/lang/ja_JP.lang Thu Aug 06 18:23:24 2015 +0900
+++ b/MirageCrops6/src/main/resources/assets/miragecrops6/lang/ja_JP.lang Thu Aug 06 18:24:24 2015 +0900
@@ -65,8 +65,9 @@
6565 item.gemCertusQuartz.name=ケルタスクォーツ
6666
6767 item.cropReedCircuit.name=配線で囲われた脳
68+item.cropReedCircuit.information=機械部品として使えそうだ。
6869 item.cropReedWire.name=ゴムで覆われた神経
69-item.circuitBasic.name=基礎回路
70+item.cropReedWire.information=機械部品として使えそうだ。
7071
7172 item.cropWartGlass.name=グラスワート
7273 item.dustGlass.name=ガラスの粉
diff -r 416da0040fae -r e2f0afcf294c MirageCrops6/src/main/resources/assets/miragecrops6/textures/items/crop/circuitBasic.png
Binary file MirageCrops6/src/main/resources/assets/miragecrops6/textures/items/crop/circuitBasic.png has changed