maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added some fixes, added documentation

Browse source
This commit is contained in:
modmuss50 2015-06-09 13:29:17 +01:00
parent 6826cfe4be
commit 92b95b9ff0
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/techreborn/api/recipe/RecipeCrafter.java
View file

@ -282,8 +282,11 @@ public class RecipeCrafter {
} }
public void addSpeedMulti(double amount){ public void addSpeedMulti(double amount){
if(speedMultiplier + amount >= 0.99) if(speedMultiplier + amount <= 0.99){
speedMultiplier += amount; speedMultiplier += amount;
} else {
speedMultiplier = 0.99;
}
} }
public void resetSpeedMulti(){ public void resetSpeedMulti(){

2
src/main/java/techreborn/api/upgrade/UpgradeHandler.java
View file

@ -33,5 +33,7 @@ public class UpgradeHandler {
((IMachineUpgrade) stack.getItem()).processUpgrade(crafter, stack); ((IMachineUpgrade) stack.getItem()).processUpgrade(crafter, stack);
} }
} }
if(crafter.currentRecipe != null)
crafter.currentNeededTicks = (int)(crafter.currentRecipe.tickTime() * (1.0 - crafter.getSpeedMultiplier()));
} }
} }

18
src/main/java/techreborn/items/ItemUpgrade.java
View file

@ -30,7 +30,7 @@ public class ItemUpgrade extends ItemTR implements IMachineUpgrade {
} }
public static final String[] types = new String[] public static final String[] types = new String[]
{"20xSpeed", "20xPower"}; {"0.2Speed", "0.2Power", "0.5Speed"};
private IIcon[] textures; private IIcon[] textures;
@ -38,6 +38,7 @@ public class ItemUpgrade extends ItemTR implements IMachineUpgrade {
setUnlocalizedName("techreborn.upgrade"); setUnlocalizedName("techreborn.upgrade");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setMaxStackSize(1);
} }
@Override @Override
@ -81,12 +82,19 @@ public class ItemUpgrade extends ItemTR implements IMachineUpgrade {
@Override @Override
public void processUpgrade(RecipeCrafter crafter, ItemStack stack) { public void processUpgrade(RecipeCrafter crafter, ItemStack stack) {
if(stack.getItemDamage() == 0){ //Remember the max speed multiplier can only be 0.99!!
crafter.addSpeedMulti(0.2);
crafter.addPowerMulti(0.5); if(stack.getItemDamage() == 0){//Check the meta data here
crafter.addSpeedMulti(0.2);//This will set the speed multiplier to 0.8
crafter.addPowerMulti(0.5);//This will use eu/tick x 1.5
//crafter.addPowerMulti(2); This will use twice the amount of power.
} }
if(stack.getItemDamage() == 1){ if(stack.getItemDamage() == 1){
crafter.addPowerMulti(-0.2); crafter.addPowerMulti(-0.2);//This will use eu/tick 0.8
}
if(stack.getItemDamage() == 2){
crafter.addSpeedMulti(0.5);
crafter.addPowerMulti(1);
} }
} }
} }