diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
38 files changed, 3981 insertions, 3492 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java index 72a875000f..64b088cac0 100644 --- a/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_CoverBehaviorLoader.java @@ -1,10 +1,10 @@ -package gregtech.loaders.load;
-
-import gregtech.api.util.GT_Log;
-
-public class GT_CoverBehaviorLoader
- implements Runnable {
- public void run() {
- GT_Log.out.println("GT_Mod: Adding Cover Behaviors");
- }
-}
+package gregtech.loaders.load; + +import gregtech.api.util.GT_Log; + +public class GT_CoverBehaviorLoader + implements Runnable { + public void run() { + GT_Log.out.println("GT_Mod: Adding Cover Behaviors"); + } +} diff --git a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java index 4268252e8f..22488cf893 100644 --- a/src/main/java/gregtech/loaders/load/GT_FuelLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_FuelLoader.java @@ -22,14 +22,16 @@ public class GT_FuelLoader ItemList.sNitricAcid = GT_Mod.gregtechproxy.addFluid("nitricacid", "Nitric acid ", null, 1, 295);
ItemList.sBlueVitriol = GT_Mod.gregtechproxy.addFluid("solution.bluevitriol", "Blue Vitriol water solution", null, 1, 295);
ItemList.sNickelSulfate = GT_Mod.gregtechproxy.addFluid("solution.nickelsulfate", "Nickel sulfate water solution", null, 1, 295);
- ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);
+ ItemList.sIndiumConcentrate = GT_Mod.gregtechproxy.addFluid("indiumconcentrate", "Indium Concentrate", null, 1, 295);//TODO CHECK NEW x3
ItemList.sLeadZincSolution = GT_Mod.gregtechproxy.addFluid("leadzincsolution", "Lead-Zinc solution", null, 1, 295);
ItemList.sRocketFuel = GT_Mod.gregtechproxy.addFluid("rocket_fuel", "Rocket Fuel", null, 1, 295);
new GT_Recipe(new ItemStack(Items.lava_bucket), new ItemStack(Blocks.obsidian), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Copper, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Electrum, 1L), 30, 2);
GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 25000);
- GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 200000);
- GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1400000);
+ GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);
+ GT_Recipe.GT_Recipe_Map.sFluidNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahEnriched, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 250000);
+ GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 500000);
+ GT_Recipe.GT_Recipe_Map.sExtraHugeNaquadahReactorFuels.addRecipe(true, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadria, 1L)}, new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Naquadah, 1L)}, null, null, null, 0, 0, 1000000);
GT_Values.RA.addFuel(GT_ModHandler.getModItem("Thaumcraft", "ItemResource", 1L, 4), null, 4, 5);
GT_Values.RA.addFuel(new ItemStack(Items.experience_bottle, 1), null, 10, 5);
diff --git a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java index 1aa13ca932..cd3f7c0bad 100644 --- a/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java +++ b/src/main/java/gregtech/loaders/load/GT_SonictronLoader.java @@ -1,155 +1,155 @@ -package gregtech.loaders.load;
-
-import gregtech.GT_Mod;
-import gregtech.api.util.GT_Log;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-public class GT_SonictronLoader
- implements Runnable {
- public void run() {
- GT_Log.out.println("GT_Mod: Loading Sonictron Sounds");
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.iron_block, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.harp");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gold_block, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.pling");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.bd");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.log, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.bassattack");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.planks, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.bass");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.hat");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sand, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("note.snare");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.record_cat, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("streaming.");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(12));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.tnt, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.explode");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(3));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.fire, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("fire.fire");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.flint_and_steel, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("fire.ignite");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lava, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("liquid.lavapop");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.water, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("liquid.water");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.water_bucket, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("liquid.splash");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.lava_bucket, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.fizz");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.portal, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("portal.portal");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("portal.travel");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal_frame, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("portal.trigger");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass_pane, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.glass");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_pearl, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.orb");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_eye, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.levelup");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone_button, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.click");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.cobblestone, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("damage.fallbig");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.dirt, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("damage.fallsmall");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_sword, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("damage.hurtflesh");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.diamond_sword, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.hurt");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bow, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.bow");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.arrow, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.drr");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.fishing_rod, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.bowhit");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_shovel, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.break");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bucket, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.breath");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.potionitem, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.drink");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.burp");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.chestopen");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.chestclosed");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_door, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.door_open");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.wooden_door, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.door_close");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.porkchop, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("random.eat");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.wool, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("step.cloth");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.grass, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("step.grass");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gravel, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("step.gravel");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.snow, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("step.snow");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.piston, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("tile.piston.out");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sticky_piston, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("tile.piston.in");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.mossy_cobblestone, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("ambient.cave.cave");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lapis_block, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("ambient.weather.rain");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.diamond_block, 1));
- GT_Mod.gregtechproxy.mSoundNames.add("ambient.weather.thunder");
- GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1));
- }
-}
+package gregtech.loaders.load; + +import gregtech.GT_Mod; +import gregtech.api.util.GT_Log; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +public class GT_SonictronLoader + implements Runnable { + public void run() { + GT_Log.out.println("GT_Mod: Loading Sonictron Sounds"); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.iron_block, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.harp"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gold_block, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.pling"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.bd"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.log, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.bassattack"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.planks, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.bass"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.hat"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sand, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("note.snare"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(25)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.record_cat, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("streaming."); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(12)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.tnt, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.explode"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(3)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.fire, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("fire.fire"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.flint_and_steel, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("fire.ignite"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lava, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("liquid.lavapop"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.water, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("liquid.water"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.water_bucket, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("liquid.splash"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.lava_bucket, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.fizz"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.portal, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("portal.portal"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("portal.travel"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.end_portal_frame, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("portal.trigger"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.glass_pane, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.glass"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_pearl, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.orb"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.ender_eye, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.levelup"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.stone_button, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.click"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.cobblestone, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("damage.fallbig"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.dirt, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("damage.fallsmall"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_sword, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("damage.hurtflesh"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.diamond_sword, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.hurt"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bow, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.bow"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.arrow, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.drr"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.fishing_rod, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.bowhit"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_shovel, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.break"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.bucket, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.breath"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.potionitem, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.drink"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.glass_bottle, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.burp"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.ender_chest == null ? Blocks.obsidian : Blocks.ender_chest, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.chestopen"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.chest, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.chestclosed"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.iron_door, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.door_open"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.wooden_door, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.door_close"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Items.porkchop, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("random.eat"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.wool, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("step.cloth"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.grass, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("step.grass"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.gravel, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("step.gravel"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.snow, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("step.snow"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.piston, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("tile.piston.out"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.sticky_piston, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("tile.piston.in"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.mossy_cobblestone, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("ambient.cave.cave"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.lapis_block, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("ambient.weather.rain"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + GT_Mod.gregtechproxy.mSoundItems.add(new ItemStack(Blocks.diamond_block, 1)); + GT_Mod.gregtechproxy.mSoundNames.add("ambient.weather.thunder"); + GT_Mod.gregtechproxy.mSoundCounts.add(Integer.valueOf(1)); + } +} diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 937d0b727f..9143e5fd95 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -15,6 +15,7 @@ import gregtech.api.objects.ItemData; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; import gregtech.common.items.GT_MetaGenerated_Tool_01; import ic2.core.Ic2Items; import net.minecraft.entity.player.EntityPlayer; @@ -39,6 +40,7 @@ public class GT_Achievements { public static List<Materials> oreList = new ArrayList<Materials>(); public static List<Integer[]> oreStats = new ArrayList<Integer[]>(); public static int oreReg = -1; + public static int assReg=-1; public ConcurrentHashMap<String, Achievement> achievementList; public ConcurrentHashMap<String, Boolean> issuedAchievements; public int adjX = 5; @@ -53,28 +55,36 @@ public class GT_Achievements { if (GT_Values.D1 && this.achievementList.get(oreList.get(i).mName) == null) { GT_Log.out.println("achievement." + oreList.get(i).mName + "=Find " + oreList.get(i).mName + " Ore"); - StringBuilder dimensions = new StringBuilder(); - boolean isFirst = true; - if (oreStats.get(i)[3] == 1) { - dimensions.append("Overworld"); - isFirst = false; - } - if (oreStats.get(i)[4] == 1) { - if (!isFirst) dimensions.append("/"); - dimensions.append("Nether"); - isFirst = false; - } - if (oreStats.get(i)[5] == 1) { - if (!isFirst) dimensions.append("/"); - dimensions.append("End"); - isFirst = false; - } - GT_Log.out.println("achievement." + oreList.get(i).mName + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString()); + StringBuilder dimensions = new StringBuilder(); + boolean isFirst = true; + if(oreStats.get(i)[3] == 1) { + dimensions.append("Overworld"); + isFirst = false; } - registerOreAchievement(oreList.get(i)); + if(oreStats.get(i)[4] == 1) { + if(!isFirst) dimensions.append("/"); + dimensions.append("Nether"); + isFirst = false; + } + if(oreStats.get(i)[5] == 1) { + if(!isFirst) dimensions.append("/"); + dimensions.append("End"); + isFirst = false; + } + GT_Log.out.println("achievement." + oreList.get(i).mName + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString()); } + //if(oreList.get(i)==null) + // GT_Log.out.println("GT Achievement - Ore with NULL pointer material tries to register achievement."); + //if(oreList.get(i).name()==null) + // GT_Log.out.println("GT Achievement - Ore with NULL named material tries to register achievement."); + //else + registerOreAchievement(oreList.get(i)); } - registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.PICKAXE, 1, Materials.Flint, Materials.Wood, null), "", false); + + for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineFakeRecipes.mRecipeList) + registerAssAchievement(recipe); + + registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1, new Object[]{}), "crops", false); reg |