EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 13:14:44 +02:00
Code Issues Projects Releases Wiki Activity

finished default repairables, diamond armor gives less xp by default

Browse Source
This commit is contained in:
nossr50
2019-03-22 16:04:31 -07:00
parent 968636b8d4
commit e232bb3699
20 changed files with 122 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -73,7 +73,7 @@ public class RepairManager extends SkillManager {
}
// Permissions checks on material and item types
if (!Permissions.repairMaterialType(player, repairable.getRepairMaterialType())) {
if (!Permissions.repairMaterialType(player, repairable.getRepairItemMaterialCategory())) {
NotificationManager.sendPlayerInformation(player, NotificationType.NO_PERMISSION, "mcMMO.NoPermission");
return;
}
@ -160,7 +160,7 @@ public class RepairManager extends SkillManager {
inventory.removeItem(toRemove);
// Give out XP like candy
applyXpGain((float) ((getPercentageRepaired(startDurability, newDurability, repairable.getMaximumDurability()) * repairable.getXpMultiplier()) * ExperienceConfig.getInstance().getRepairXPBase() * ExperienceConfig.getInstance().getRepairXP(repairable.getRepairMaterialType())), XPGainReason.PVE);
applyXpGain((float) ((getPercentageRepaired(startDurability, newDurability, repairable.getMaximumDurability()) * repairable.getXpMultiplier()) * ExperienceConfig.getInstance().getRepairXPBase() * ExperienceConfig.getInstance().getRepairXP(repairable.getRepairItemMaterialCategory())), XPGainReason.PVE);
// BWONG BWONG BWONG
if (mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().isAnvilUseSounds()) {

4
src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java
View File

@ -2,7 +2,7 @@
package com.gmail.nossr50.skills.repair.repairables;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory;
import org.bukkit.Material;
@ -41,7 +41,7 @@ public interface Repairable {
* @return the RepairMaterialType for this repairable
*//*
public MaterialType getRepairMaterialType();
public ItemMaterialCategory getRepairItemMaterialCategory();
*/
/**

28
src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.skills.repair.repairables;
import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import com.gmail.nossr50.util.ItemUtils;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
@ -16,7 +16,7 @@ public class SimpleRepairable {
private final int minimumQuantity, minimumLevel;
private final short maximumDurability, baseRepairDurability;
private final ItemType repairItemType;
private final MaterialType repairMaterialType;
private final ItemMaterialCategory repairItemMaterialCategory;
private final double xpMultiplier;
public SimpleRepairable(Material itemMaterial, Material repairMaterial, int minimumQuantity, int minimumLevel, double xpMultiplier) {
@ -38,16 +38,16 @@ public class SimpleRepairable {
this.baseRepairDurability = (short) (maximumDurability / minimumQuantity);
this.repairItemType = determineItemType(this.itemMaterial);
this.repairMaterialType = determineMaterialType(this.repairMaterials.get(0));
this.repairItemMaterialCategory = determineMaterialType(this.repairMaterials.get(0));
}
public MaterialType determineMaterialType(Material material) {
public ItemMaterialCategory determineMaterialType(Material material) {
switch (material) {
case STRING:
return MaterialType.STRING;
return ItemMaterialCategory.STRING;
case LEATHER:
return MaterialType.LEATHER;
return ItemMaterialCategory.LEATHER;
case ACACIA_PLANKS:
case BIRCH_PLANKS:
@ -55,22 +55,22 @@ public class SimpleRepairable {
case JUNGLE_PLANKS:
case OAK_PLANKS:
case SPRUCE_PLANKS:
return MaterialType.WOOD;
return ItemMaterialCategory.WOOD;
case STONE:
return MaterialType.STONE;
return ItemMaterialCategory.STONE;
case IRON_INGOT:
return MaterialType.IRON;
return ItemMaterialCategory.IRON;
case GOLD_INGOT:
return MaterialType.GOLD;
return ItemMaterialCategory.GOLD;
case DIAMOND:
return MaterialType.DIAMOND;
return ItemMaterialCategory.DIAMOND;
default:
return MaterialType.OTHER;
return ItemMaterialCategory.OTHER;
}
}
@ -103,8 +103,8 @@ public class SimpleRepairable {
return repairItemType;
}
public MaterialType getRepairMaterialType() {
return repairMaterialType;
public ItemMaterialCategory getRepairItemMaterialCategory() {
return repairItemMaterialCategory;
}
public int getMinimumQuantity() {

2
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@ -75,7 +75,7 @@ public class SalvageManager extends SkillManager {
return;
}
if (!Permissions.salvageMaterialType(player, salvageable.getSalvageMaterialType())) {
if (!Permissions.salvageMaterialType(player, salvageable.getSalvageItemMaterialCategory())) {
NotificationManager.sendPlayerInformation(player, NotificationType.NO_PERMISSION, "mcMMO.NoPermission");
return;
}

8
src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.skills.salvage.salvageables;
import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import org.bukkit.Material;
public interface Salvageable {
@ -34,11 +34,11 @@ public interface Salvageable {
public ItemType getSalvageItemType();
/**
* Gets the MaterialType value for this salvageable item
* Gets the ItemMaterialCategory value for this salvageable item
*
* @return the MaterialType for this salvageable
* @return the ItemMaterialCategory for this salvageable
*/
public MaterialType getSalvageMaterialType();
public ItemMaterialCategory getSalvageItemMaterialCategory();
/**
* Gets the maximum quantity of salvage materials ignoring all other salvage bonuses

8
src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java
View File

@ -1,16 +1,16 @@
package com.gmail.nossr50.skills.salvage.salvageables;
import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import org.bukkit.Material;
public class SalvageableFactory {
public static Salvageable getSalvageable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int maximumQuantity, short maximumDurability) {
return getSalvageable(itemMaterial, repairMaterial, repairMetadata, 0, maximumQuantity, maximumDurability, ItemType.OTHER, MaterialType.OTHER, 1);
return getSalvageable(itemMaterial, repairMaterial, repairMetadata, 0, maximumQuantity, maximumDurability, ItemType.OTHER, ItemMaterialCategory.OTHER, 1);
}
public static Salvageable getSalvageable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int minimumLevel, int maximumQuantity, short maximumDurability, ItemType repairItemType, MaterialType repairMaterialType, double xpMultiplier) {
public static Salvageable getSalvageable(Material itemMaterial, Material repairMaterial, byte repairMetadata, int minimumLevel, int maximumQuantity, short maximumDurability, ItemType repairItemType, ItemMaterialCategory repairItemMaterialCategory, double xpMultiplier) {
// TODO: Add in loading from config what type of repairable we want.
return new SimpleSalvageable(itemMaterial, repairMaterial, repairMetadata, minimumLevel, maximumQuantity, maximumDurability, repairItemType, repairMaterialType, xpMultiplier);
return new SimpleSalvageable(itemMaterial, repairMaterial, repairMetadata, minimumLevel, maximumQuantity, maximumDurability, repairItemType, repairItemMaterialCategory, xpMultiplier);
}
}

12
src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java
View File

@ -1,7 +1,7 @@
package com.gmail.nossr50.skills.salvage.salvageables;
import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import org.bukkit.Material;
@ -11,15 +11,15 @@ public class SimpleSalvageable implements Salvageable {
private final short maximumDurability, baseSalvageDurability;
private final byte salvageMetadata;
private final ItemType salvageItemType;
private final MaterialType salvageMaterialType;
private final ItemMaterialCategory salvageItemMaterialCategory;
private final double xpMultiplier;
protected SimpleSalvageable(Material type, Material salvageMaterial, byte salvageMetadata, int minimumLevel, int maximumQuantity, short maximumDurability, ItemType salvageItemType, MaterialType salvageMaterialType, double xpMultiplier) {
protected SimpleSalvageable(Material type, Material salvageMaterial, byte salvageMetadata, int minimumLevel, int maximumQuantity, short maximumDurability, ItemType salvageItemType, ItemMaterialCategory salvageItemMaterialCategory, double xpMultiplier) {
this.itemMaterial = type;
this.salvageMaterial = salvageMaterial;
this.salvageMetadata = salvageMetadata;
this.salvageItemType = salvageItemType;
this.salvageMaterialType = salvageMaterialType;
this.salvageItemMaterialCategory = salvageItemMaterialCategory;
this.minimumLevel = minimumLevel;
this.maximumQuantity = maximumQuantity;
this.maximumDurability = maximumDurability;
@ -48,8 +48,8 @@ public class SimpleSalvageable implements Salvageable {
}
@Override
public MaterialType getSalvageMaterialType() {
return salvageMaterialType;
public ItemMaterialCategory getSalvageItemMaterialCategory() {
return salvageItemMaterialCategory;
}
@Override