aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java5
-rw-r--r--src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java7
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java41
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java30
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java30
-rw-r--r--src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java14
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java2
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java33
-rw-r--r--src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java1
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.pngbin3013 -> 3196 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.pngbin3004 -> 5117 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.pngbin3011 -> 3163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.pngbin3014 -> 3151 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.pngbin3012 -> 3161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.pngbin3013 -> 3156 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.pngbin3013 -> 3175 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.pngbin3013 -> 3157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.pngbin3013 -> 3155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.pngbin0 -> 3196 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.pngbin0 -> 5117 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.pngbin0 -> 3163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.pngbin0 -> 3151 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.pngbin0 -> 3161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.pngbin0 -> 3156 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.pngbin0 -> 3175 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.pngbin0 -> 3157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.pngbin0 -> 3155 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.pngbin0 -> 3196 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.pngbin0 -> 5117 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.pngbin0 -> 3163 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.pngbin0 -> 3151 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.pngbin0 -> 3161 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.pngbin0 -> 3156 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.pngbin0 -> 3175 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.pngbin0 -> 3157 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.pngbin0 -> 3155 bytes
36 files changed, 132 insertions, 31 deletions
diff --git a/src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java b/src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java
new file mode 100644
index 0000000000..02b3a9f397
--- /dev/null
+++ b/src/Java/miscutil/core/block/machine/Machine_WireiusDeletus.java
@@ -0,0 +1,5 @@
+package miscutil.core.block.machine;
+
+public class Machine_WireiusDeletus { //A Block that removes GT Cable and Wire from it's inventory.
+
+}
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
index df1f58aca4..f2590f0282 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechRocketFuelGenerator.java
@@ -10,9 +10,14 @@ import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes;
import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import miscutil.core.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator;
+import net.minecraft.item.ItemStack;
public class GregtechRocketFuelGenerator {
+
+ static ItemStack INGREDIENT_1 = GregtechItemList.Electric_Piston_LuV.get(1);
+ static ItemStack INGREDIENT_2 = GregtechItemList.Electric_Motor_LuV.get(1);
+
public static void run()
{
if (LoadedMods.Gregtech){
@@ -29,7 +34,7 @@ public class GregtechRocketFuelGenerator {
GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('P'), ItemList.Electric_Piston_EV, Character.valueOf('E'), ItemList.Electric_Motor_EV, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(Materials.Ultimate), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Aluminium), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Titanium)});
GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('P'), ItemList.Electric_Piston_IV, Character.valueOf('E'), ItemList.Electric_Motor_IV, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Platinum), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.TungstenSteel)});
- GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), GregtechItemList.Electric_Piston_LuV, Character.valueOf('E'), ItemList.Electric_Motor_LuV, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
+ GT_ModHandler.addCraftingRecipe(GregtechItemList.Rocket_Engine_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('P'), INGREDIENT_1, Character.valueOf('E'), INGREDIENT_2, Character.valueOf('C'), GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic), Character.valueOf('W'), OrePrefixes.cableGt02.get(Materials.Tungsten), Character.valueOf('G'), OrePrefixes.gearGt.get(Materials.Chrome)});
}
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java
new file mode 100644
index 0000000000..f32ed1fbe9
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDustAbstract.java
@@ -0,0 +1,41 @@
+package miscutil.core.item.base.dusts;
+
+import java.util.List;
+
+import miscutil.core.lib.CORE;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public abstract class BaseItemDustAbstract extends Item{
+
+ protected int colour = 0;
+ protected String materialName;
+ protected String pileType;
+
+ public BaseItemDustAbstract(String unlocalizedName, String materialName, int colour, String pileSize) {
+ this.setUnlocalizedName(unlocalizedName);
+ this.setMaxStackSize(64);
+ if (pileSize == "dust" || pileSize == "Dust"){
+ this.setTextureName(CORE.MODID + ":" + "dust");
+ }
+ else{
+ this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);
+ }
+ this.setMaxStackSize(64);
+ this.colour = colour;
+ this.materialName = materialName;
+ setUnlocalizedName(unlocalizedName);
+ GameRegistry.registerItem(this, unlocalizedName);
+ }
+
+ @Override
+ public abstract void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool);
+
+ public abstract String getMaterialName();
+
+ @Override
+ public abstract int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF);
+
+}
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java
new file mode 100644
index 0000000000..2e0334887b
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDustSmall.java
@@ -0,0 +1,30 @@
+package miscutil.core.item.base.dusts;
+
+import java.util.List;
+
+import miscutil.core.lib.CORE;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+public class BaseItemDustSmall extends BaseItemDust{
+
+ protected int colour = 0;
+ protected String materialName;
+
+ public BaseItemDustSmall(String unlocalizedName, String materialName, int colour, String size) {
+ super(unlocalizedName, materialName, colour, size);
+ this.setTextureName(CORE.MODID + ":" + "dustSmall");
+ this.setMaxStackSize(64);
+ this.colour = colour;
+ this.materialName = materialName;
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+ list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust.");
+ super.addInformation(stack, aPlayer, list, bool);
+ }
+
+}
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java
new file mode 100644
index 0000000000..814f79ebd7
--- /dev/null
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDustTiny.java
@@ -0,0 +1,30 @@
+package miscutil.core.item.base.dusts;
+
+import java.util.List;
+
+import miscutil.core.lib.CORE;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+public class BaseItemDustTiny extends BaseItemDust{
+
+ protected int colour = 0;
+ protected String materialName;
+
+ public BaseItemDustTiny(String unlocalizedName, String materialName, int colour, String size) {
+ super(unlocalizedName, materialName, colour, size);
+ this.setTextureName(CORE.MODID + ":" + "dustTiny");
+ this.setMaxStackSize(64);
+ this.colour = colour;
+ this.materialName = materialName;
+ }
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+ list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust.");
+ super.addInformation(stack, aPlayer, list, bool);
+ }
+
+}
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index 7c28243ef5..9a54a9d04e 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -11,6 +11,7 @@ import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.util.fluid.FluidUtils;
import miscutil.core.util.item.UtilsItems;
+import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
public class RECIPES_GREGTECH {
@@ -25,6 +26,7 @@ public class RECIPES_GREGTECH {
assemblerRecipes();
distilleryRecipes();
mixerRecipes();
+ extractorRecipes();
addFuels();
}
@@ -122,10 +124,13 @@ public class RECIPES_GREGTECH {
private static void addFuels(){
Utils.LOG_INFO("Registering New Fuels.");
- CORE.RA.addFuel(GT_ModHandler.getModItem("Minecraft", "bucket_lava", 1L, 1), null, 2800, 1);
+ //CORE.RA.addFuel(GT_ModHandler.getModItem("Minecraft", "bucket_lava", 1L, 1), null, 2800, 1);
//CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketRocket_fuel", 1L, 1), null, 2800, 0);
//CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketHootch", 1L, 1), null, 2800, 0);
//CORE.RA.addFuel(GT_ModHandler.getModItem("EnderIO", "bucketFire_water", 1L, 1), null, 2800, 0);
+ GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
+ GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
+ GT_Values.RA.addFuel(UtilsItems.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
//System.exit(1);
}
@@ -134,7 +139,12 @@ public class RECIPES_GREGTECH {
GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustStaballoy, 2), 32, 8);
GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustSmallStaballoy, 2), 32, 8);
GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium, 8L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Titanium, 1L), null, null, GT_Values.NF, GT_Values.NF, UtilsItems.getSimpleStack(ModItems.itemDustTinyStaballoy, 2), 32, 8);
-
+ }
+
+ private static void extractorRecipes(){
+ GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
+ GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
+ GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
}
private static void registerSkookumChoocher(){
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
index e7b0a2681b..9ee31ac587 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
@@ -76,7 +76,7 @@ public enum GregtechItemList implements GregtechItemContainer {
Shape_Extruder_WindmillShaft,
//Batteries
- Battery_RE_EV_Sodium,
+ Battery_RE_EV_Sodium, Battery_RE_EV_Cadmium, Battery_RE_EV_Lithium,
//Industrial Electrolyzer
Casing_Electrolyzer, Industrial_Electrolyzer,
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 14f0cc2213..6831c56db2 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -109,28 +109,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
//GT_ModHandler.addCraftingRecipe(GregtechItemList.Sensor_MAX.get(1L, new Object[0]), //GT_ModHandler.RecipeBits.DISMANTLEABLE | //GT_ModHandler.RecipeBits.NOT_REMOVABLE | //GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"P Q", "PS ", "CPP", Character.valueOf('Q'), OrePrefixes.gem.get(Materials.EnderPearl), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Platinum), Character.valueOf('P'), OrePrefixes.plate.get(Materials.Titanium), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Elite)});
- /* GregtechItemList.Circuit_Primitive.set(addItem(tLastID = 700, "Circuit"+" "+tLastID, "A simple Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Primitive)}));
- GregtechItemList.Circuit_Basic.set(addItem(tLastID = 701, "Circuit"+" "+tLastID, "A basic Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Basic)}));
- GregtechItemList.Circuit_Good.set(addItem(tLastID = 702, "Circuit"+" "+tLastID, "A good Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Good)}));
- GregtechItemList.Circuit_Advanced.set(addItem(tLastID = 703, "Circuit"+" "+tLastID, "An advanced Circuit", new Object[]{OrePrefixes.circuit.get(Materials.Advanced)}));
- GregtechItemList.Circuit_Data.set(addItem(tLastID = 704, "Circuit"+" "+tLastID, "A Data Chip", new Object[]{OrePrefixes.circuit.get(Materials.Data)}));
- GregtechItemList.Circuit_Elite.set(addItem(tLastID = 705, "Circuit"+" "+tLastID, "A Processor", new Object[]{OrePrefixes.circuit.get(Materials.Elite)}));
- GregtechItemList.Circuit_Master.set(addItem(tLastID = 706, "Circuit"+" "+tLastID, "A High Voltage Processor", new Object[]{OrePrefixes.circuit.get(Materials.Master)}));
- GregtechItemList.Tool_DataOrb.set(addItem(tLastID = 707, "Data Orb", "A High Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, new Behaviour_DataOrb()}));
- GregtechItemList.Circuit_Ultimate.set(ItemList.Tool_DataOrb.get(1L, new Object[0]));
- GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataOrb.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataOrb.get(1L, new Object[0])});
- GregtechItemList.Tool_DataStick.set(addItem(tLastID = 708, "Data Stick", "A Low Capacity Data Storage", new Object[]{OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, new Behaviour_DataStick()}));
- GT_ModHandler.addShapelessCraftingRecipe(ItemList.Tool_DataStick.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{ItemList.Tool_DataStick.get(1L, new Object[0])});
-
-*
-*
- Circuit_IV, Circuit_LuV, Circuit_ZPM,
- Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM,
- Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM,
- Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
- Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM;
-*
-*/
+
@@ -140,13 +119,13 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
//Batteries
GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Sodium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)}));
- setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[2], 4L, -3L, true);
+ setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true);
- GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 51, "Quad Cell Cadmium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
- setElectricStats(32000 + tLastID, 480000L, GT_Values.V[2], 4L, -3L, true);
+ GregtechItemList.Battery_RE_EV_Cadmium.set(addItem(tLastID = 52, "Quad Cell Cadmium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
+ setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true);
- GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 52, "Quad Cell Lithium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 3L)}));
- setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[2], 4L, -3L, true);
+ GregtechItemList.Battery_RE_EV_Lithium.set(addItem(tLastID = 54, "Quad Cell Lithium Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 3L)}));
+ setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true);
/*GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)}));
setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, -3L, true);
diff --git a/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java b/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java
index 4998382f07..d4033fbf9b 100644
--- a/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java
+++ b/src/Java/miscutil/core/xmod/ic2/HANDLER_IC2.java
@@ -9,6 +9,7 @@ public class HANDLER_IC2{
public static void preInit() {
if (LoadedMods.IndustrialCraft2){
IC2_Items.register();
+ //new IC2_BlockKineticGenerator(InternalName.blockKineticGenerator);
}
}
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png
index e7c244df58..422b0fd5df 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png
index f7cb5fd944..1ced435a76 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png
index 1ff5be4ed9..492db7d4ba 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png
index 695818747b..404730cc20 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png
index 69355d9ba7..bdac346dda 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png
index 9ad8611239..90e304bad3 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png
index 1044aa3eee..1294d07d71 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png
index f8d5cfbe1b..145918212f 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png
index e7c244df58..6e2900017e 100644
--- a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/50/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png
new file mode 100644
index 0000000000..422b0fd5df
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png
new file mode 100644
index 0000000000..1ced435a76
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png
new file mode 100644
index 0000000000..492db7d4ba
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png
new file mode 100644
index 0000000000..404730cc20
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png
new file mode 100644
index 0000000000..bdac346dda
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png
new file mode 100644
index 0000000000..90e304bad3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png
new file mode 100644
index 0000000000..1294d07d71
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png
new file mode 100644
index 0000000000..145918212f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png
new file mode 100644
index 0000000000..6e2900017e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/52/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png
new file mode 100644
index 0000000000..422b0fd5df
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png
new file mode 100644
index 0000000000..1ced435a76
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/1.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png
new file mode 100644
index 0000000000..492db7d4ba
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/2.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png
new file mode 100644
index 0000000000..404730cc20
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/3.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png
new file mode 100644
index 0000000000..bdac346dda
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/4.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png
new file mode 100644
index 0000000000..90e304bad3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/5.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png
new file mode 100644
index 0000000000..1294d07d71
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png
new file mode 100644
index 0000000000..145918212f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png
new file mode 100644
index 0000000000..6e2900017e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/MU-metaitem.01/54/8.png
Binary files differ