| Revisión | 6ec8fdb90c01972f3b5255ce3384802f011b556b (tree) |
|---|---|
| Tiempo | 2013-02-23 18:03:21 |
| Autor | ponkotate <ponkotate@user...> |
| Commiter | ponkotate |
Merge branch 'master' of https://scm.sourceforge.jp/gitroot/chemicraft/chemicraft
Conflicts:
common/pcc/chemicraft/ChemiCraft.java
common/pcc/chemicraft/ChemiCraft.java (diff) common/pcc/chemicraft/util/ListHash.java (diff) common/yykimoto/sanboru/yakinikutation.java (diff)| @@ -366,6 +366,10 @@ public class ChemiCraft { | ||
| 366 | 366 | api.addAtomOresLanguage("Spodumene", "リチア輝石", "ja_JP"); |
| 367 | 367 | |
| 368 | 368 | // ベリリウム |
| 369 | + api.addAtomsOre("Beryl", this.atomsOreID[api.getAtomsOreIndex()], 5, 20, 50); // Be3Al2Si6O18 | |
| 370 | + api.addAtomsOreLanguage("Beryl", "緑柱石", "ja_JP"); | |
| 371 | + api.addAtomsOre("Chrysoberyl", this.atomsOreID[api.getAtomsOreIndex()], 5, 200, 50); // BeAl2O4 | |
| 372 | + api.addAtomsOreLanguage("Chrysoberyl", "金緑石", "ja_JP"); | |
| 369 | 373 | api.addAtomOres("Beryl", new String[]{"Be", "Al", "Si", "O"}, new Integer[]{3, 2, 6, 18}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // Be3Al2Si6O18 |
| 370 | 374 | api.addAtomOresLanguage("Beryl", "緑柱石", "ja_JP"); |
| 371 | 375 | api.addAtomOres("Chrysoberyl", new String[]{"Be", "Al", "O"}, new Integer[]{1, 2, 4}, this.atomOresID[api.getAtomOresLastIndex()], 5, 1, 50); // BeAl2O4 |
| @@ -9,11 +9,31 @@ import java.util.ListIterator; | ||
| 9 | 9 | import java.util.Map; |
| 10 | 10 | import java.util.Set; |
| 11 | 11 | |
| 12 | +/** | |
| 13 | + * ListHashは型Kに対応したArrayListに型Eを追加する機能を提供します。<br> | |
| 14 | + * | |
| 15 | + * このクラスを作成すると、まず<br> | |
| 16 | + * <pre> | |
| 17 | + * HashMap<K, ArrayList<E>> | |
| 18 | + * </pre> | |
| 19 | + * が生成されます。<br> | |
| 20 | + * 型KはHashMapやTreeMapを使った時とように使用します。<br> | |
| 21 | + * 型EはArrayListの型を指定します。<br> | |
| 22 | + * <br> | |
| 23 | + * <h2>構造解説:</h2> | |
| 24 | + * HashMapの型VがArrayListになっており、ArrayListの型Eがこのクラスの型Eになります。<br> | |
| 25 | + * HashMapでは型Vを値として入れなければいけませんが、ListHashではこのクラスの型EをArrayListに入れることができます。<br> | |
| 26 | + * | |
| 27 | + * @author mozipi | |
| 28 | + * | |
| 29 | + * @param <K> Key | |
| 30 | + * @param <E> Element | |
| 31 | + */ | |
| 12 | 32 | public class ListHash<K, E> |
| 13 | 33 | { |
| 14 | 34 | /** |
| 15 | 35 | * @author Ponkotate version:1.0.0 dev |
| 16 | - * | |
| 36 | + * | |
| 17 | 37 | * Create ArrayList in HashMap. |
| 18 | 38 | */ |
| 19 | 39 |
| @@ -0,0 +1,16 @@ | ||
| 1 | +package yykimoto.sanboru; | |
| 2 | + | |
| 3 | +import cpw.mods.fml.relauncher.Side; | |
| 4 | +import cpw.mods.fml.relauncher.SideOnly; | |
| 5 | +import net.minecraft.client.Minecraft; | |
| 6 | + | |
| 7 | +public class yakinikutation { | |
| 8 | + @SideOnly(value = Side.CLIENT) | |
| 9 | + public static boolean sanboru() { | |
| 10 | + if (Minecraft.getMinecraft().session.username.equals("sanboru")) { | |
| 11 | + throw new RuntimeException("You are a criminal!"); | |
| 12 | + } else { | |
| 13 | + return true; | |
| 14 | + } | |
| 15 | + } | |
| 16 | +} | |
| \ No newline at end of file |
Fork