Skip to content

Commit 8b69b61

Browse files
committed
Quite a bit of stuff, including IVFluidEntries.
Yes, you will be able to both burn and replicate fluids using IV. Period.
1 parent 27c1e67 commit 8b69b61

28 files changed

+264
-62
lines changed
570 Bytes
Loading
570 Bytes
Loading
782 Bytes
Loading
570 Bytes
Loading
570 Bytes
Loading
570 Bytes
Loading
570 Bytes
Loading

makmods/levelstorage/armor/ArmorFunctions.java

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,6 @@ public static MovingObjectPosition getMovingObjectPositionFromPlayer(
9292
Integer.valueOf(25000));
9393
}
9494

95-
public static void walkWater(World world, EntityPlayer player,
96-
ItemStack armor) {
97-
if (LSKeyboard.getInstance().isKeyDown(player,
98-
LSKeyboard.RANGE_KEY_NAME)
99-
&& player.inventory.getCurrentItem() == null) {
100-
if (ElectricItem.manager.canUse(armor,
101-
ItemArmorAntimatterBase.EU_PER_TICK_WATERWALK)) {
102-
if (!world.isRemote)
103-
ElectricItem.manager.use(armor,
104-
ItemArmorAntimatterBase.EU_PER_TICK_WATERWALK,
105-
player);
106-
if (player.motionY > 0)
107-
player.motionY = 0;
108-
}
109-
}
110-
}
111-
11295
public static void antimatterLeggingsFunctions(World world,
11396
EntityPlayer player, ItemStack armor) {
11497
if (world.isRemote)
@@ -121,9 +104,9 @@ public static void antimatterLeggingsFunctions(World world,
121104
player, true);
122105
if (mop != null && mop.typeOfHit == EnumMovingObjectType.TILE) {
123106
if (ElectricItem.manager.canUse(armor,
124-
ItemArmorAntimatterBase.EU_PER_TELEPORT))
125-
ElectricItem.manager.use(armor,
126-
ItemArmorAntimatterBase.EU_PER_TELEPORT, player);
107+
ItemArmorAntimatterBase.EU_PER_TELEPORT)) {
108+
ElectricItem.manager.discharge(armor, ItemArmorAntimatterBase.EU_PER_TELEPORT, Integer.MAX_VALUE, true, false);
109+
}
127110
x = mop.blockX;
128111
y = mop.blockY;
129112
z = mop.blockZ;
@@ -145,7 +128,7 @@ public static void helmetFunctions(World world, EntityPlayer player,
145128
if (!world.isRemote) {
146129
Entity toShoot = EntityUtil.getTarget(world, player, 128);
147130
if (toShoot != null) {
148-
ElectricItem.manager.use(itemStack, RAY_COST, player);
131+
ElectricItem.manager.discharge(itemStack, RAY_COST, Integer.MAX_VALUE, true, false);
149132
PacketTeslaRay.issue(player.posX, player.posY + 1.6,
150133
player.posZ, toShoot.posX, toShoot.posY,
151134
toShoot.posZ);
@@ -161,7 +144,7 @@ public static void helmetFunctions(World world, EntityPlayer player,
161144
if (!world.isRemote) {
162145
if (player.getFoodStats().getFoodLevel() < 18) {
163146
if (ElectricItem.manager.canUse(itemStack, FOOD_COST)) {
164-
ElectricItem.manager.use(itemStack, FOOD_COST, player);
147+
ElectricItem.manager.discharge(itemStack, FOOD_COST, Integer.MAX_VALUE, true, false);
165148
player.getFoodStats().addStats(20, 20);
166149
}
167150
}
@@ -181,8 +164,7 @@ public static void helmetFunctions(World world, EntityPlayer player,
181164
* (effect.getAmplifier() + 1));
182165

183166
if (ElectricItem.manager.canUse(itemStack, cost.intValue())) {
184-
ElectricItem.manager.use(itemStack, cost.intValue(),
185-
null);
167+
ElectricItem.manager.discharge(itemStack, cost.intValue(), Integer.MAX_VALUE, true, false);
186168
player.removePotionEffect(id);
187169
}
188170
}
@@ -203,7 +185,7 @@ public static void speedUp(EntityPlayer player, ItemStack itemStack) {
203185

204186
if (speedTicker >= 10) {
205187
speedTicker = 0;
206-
ElectricItem.manager.use(itemStack, 1000, null);
188+
ElectricItem.manager.discharge(itemStack, 1000, Integer.MAX_VALUE, true, false);
207189
}
208190
speedTickerMap.remove(player);
209191
speedTickerMap.put(player, Integer.valueOf(speedTicker));
@@ -232,7 +214,7 @@ public static void jumpBooster(World world, EntityPlayer player,
232214
if ((wasOnGround) && (!player.onGround)
233215
&& (Keys.instance.isJumpKeyDown(player))
234216
&& (Keys.instance.isBoostKeyDown(player))) {
235-
ElectricItem.manager.use(itemStack, 4000, null);
217+
ElectricItem.manager.discharge(itemStack, 4000, Integer.MAX_VALUE, true, false);
236218
}
237219
onGroundMap.remove(player);
238220
onGroundMap.put(player, Boolean.valueOf(player.onGround));
@@ -274,13 +256,12 @@ public static void fly(int energy, EntityPlayer player,
274256
float boost = 0.44f;
275257
player.moveFlying(0.0F, 1.0F, boost);
276258
if (!world.isRemote) {
277-
ElectricItem.manager.use(itemStack, energy * 3, player);
259+
ElectricItem.manager.discharge(itemStack, energy * 3, Integer.MAX_VALUE, true, false);
278260
}
279261
}
280262
if (!world.isRemote) {
281263
if (!player.capabilities.isCreativeMode) {
282-
ElectricItem.manager.use(itemStack, energy, player);
283-
264+
ElectricItem.manager.discharge(itemStack, energy, Integer.MAX_VALUE, true, false);
284265
MinecraftForge.EVENT_BUS.post(new BootsFlyingEvent(
285266
player, itemStack));
286267
}

makmods/levelstorage/armor/ItemArmorEnergeticChestplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ItemArmorEnergeticChestplate extends ItemArmor implements
3939

4040
public static final int TIER = 3;
4141
public static final int STORAGE = CommonProxy.ARMOR_STORAGE;
42-
public static final int ENERGY_PER_DAMAGE = 900;
42+
public static final int ENERGY_PER_DAMAGE = 30000;
4343
public static final int ENTITY_MAX_DISTANCE = 16;
4444
public static final int ENERGY_PER_TICK_ENTITIES = 100;
4545

makmods/levelstorage/armor/ItemArmorEnhancedNanoChestplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class ItemArmorEnhancedNanoChestplate extends ItemArmor implements
4242
ISpecialArmor, IMetalArmor, IElectricItem, IHasRecipe {
4343
public static final int TIER = 3;
4444
public static final int STORAGE = CommonProxy.ENH_LAPPACK_STORAGE;
45-
public static final int ENERGY_PER_DAMAGE = 800;
45+
public static final int ENERGY_PER_DAMAGE = 5000;
4646
public static int RENDER_ID = 0;
4747

4848
public ItemArmorEnhancedNanoChestplate(int id) {

0 commit comments

Comments
 (0)