Skip to content

Commit 00d677f

Browse files
TravjaTravja
committed
Revert "Merge pull request #307 from magemonkeystudio/legacy-improvement"
This reverts commit 43c52aa, reversing changes made to 67ca4e4.
1 parent 2889b05 commit 00d677f

9 files changed

Lines changed: 8 additions & 53 deletions

File tree

‎src/main/java/studio/magemonkey/divinity/config/EngineCfg.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public EngineCfg(@NotNull Divinity plugin) throws InvalidConfigurationException
4848
public static boolean ATTRIBUTES_ALLOW_HOLD_REQUIREMENTS;
4949

5050
public static boolean ATTRIBUTES_DURABILITY_BREAK_ITEMS;
51-
public static boolean ATTRIBUTES_HIDE_FLAGS;
5251
public static boolean ATTRIBUTES_DURABILITY_REDUCE_FOR_MOBS;
5352
public static Set<String> ATTRIBUTES_DURABILITY_REDUCE_FOR_SKILL_API;
5453

@@ -57,7 +56,6 @@ public EngineCfg(@NotNull Divinity plugin) throws InvalidConfigurationException
5756
public static double COMBAT_SHIELD_BLOCK_BONUS_DAMAGE_MOD;
5857
public static int COMBAT_SHIELD_BLOCK_COOLDOWN;
5958
public static boolean LEGACY_COMBAT;
60-
public static boolean FULL_LEGACY;
6159
public static boolean COMBAT_DISABLE_VANILLA_SWEEP;
6260
public static boolean COMBAT_REDUCE_PLAYER_HEALTH_BAR;
6361
public static boolean COMBAT_FISHING_HOOK_DO_DAMAGE;
@@ -179,7 +177,6 @@ public void setup() {
179177
EngineCfg.ATTRIBUTES_EFFECTIVE_FOR_MOBS = cfg.getBoolean(path + "effective-for-mobs");
180178
EngineCfg.ATTRIBUTES_EFFECTIVE_IN_OFFHAND = cfg.getBoolean(path + "effective-in-offhand");
181179
EngineCfg.ATTRIBUTES_ALLOW_HOLD_REQUIREMENTS = cfg.getBoolean(path + "allow-hold-items-you-cant-use");
182-
EngineCfg.ATTRIBUTES_HIDE_FLAGS = cfg.getBoolean(path + "hide-flags");
183180

184181
path = "attributes.durability.";
185182
EngineCfg.ATTRIBUTES_DURABILITY_BREAK_ITEMS = cfg.getBoolean(path + "break-items-on-zero");

‎src/main/java/studio/magemonkey/divinity/manager/EntityManager.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import studio.magemonkey.divinity.api.event.DivinityDamageEvent;
2020
import studio.magemonkey.divinity.api.event.EntityDivinityItemPickupEvent;
2121
import studio.magemonkey.divinity.api.event.EntityEquipmentChangeEvent;
22-
import studio.magemonkey.divinity.config.EngineCfg;
2322
import studio.magemonkey.divinity.modules.api.QModuleDrop;
2423
import studio.magemonkey.divinity.stats.EntityStats;
2524
import studio.magemonkey.divinity.stats.EntityStatsTask;
@@ -91,7 +90,6 @@ public void shutdown() {
9190

9291
@EventHandler(priority = EventPriority.MONITOR)
9392
public void onStatsDeath(EntityDeathEvent e) {
94-
if(EngineCfg.FULL_LEGACY) return;
9593
LivingEntity entity = e.getEntity();
9694
previousEquipment.remove(e.getEntity().getUniqueId());
9795
EntityStats.get(entity).handleDeath();
@@ -100,20 +98,17 @@ public void onStatsDeath(EntityDeathEvent e) {
10098
// Clear stats on player exit
10199
@EventHandler(priority = EventPriority.HIGHEST)
102100
public void onStatsQuit(PlayerQuitEvent e) {
103-
if(EngineCfg.FULL_LEGACY) return;
104101
EntityStats.purge(e.getPlayer());
105102
}
106103

107104
@EventHandler(priority = EventPriority.HIGHEST)
108105
public void onStatsJoin(PlayerJoinEvent e) {
109-
if(EngineCfg.FULL_LEGACY) return;
110106
EntityStats.get(e.getPlayer());
111107
this.pushToUpdate(e.getPlayer(), 1D);
112108
}
113109

114110
@EventHandler
115111
public void quit(PlayerQuitEvent event) {
116-
if(EngineCfg.FULL_LEGACY) return;
117112
previousEquipment.remove(event.getPlayer().getUniqueId());
118113
}
119114

@@ -129,7 +124,6 @@ public void onStatsRegen(EntityRegainHealthEvent e) {
129124

130125
@EventHandler(ignoreCancelled = true)
131126
public void onPickup(EntityPickupItemEvent e) {
132-
if(EngineCfg.FULL_LEGACY) return;
133127
if (!ProjectileStats.isPickable(e.getItem())) {
134128
e.setCancelled(true);
135129
}
@@ -144,7 +138,6 @@ public void onPickup(EntityPickupItemEvent e) {
144138
}
145139

146140
private final void pushToUpdate(@NotNull LivingEntity entity, double time) {
147-
if(EngineCfg.FULL_LEGACY) return;
148141
EntityEquipment equip = new EntityEquipmentSnapshot(entity);
149142
previousEquipment.put(entity.getUniqueId(), equip);
150143
if (time <= 0D) {
@@ -160,7 +153,6 @@ public void run() {
160153
}
161154

162155
private final void addDuplicatorFixer(@NotNull Entity entity) {
163-
if(EngineCfg.FULL_LEGACY) return;
164156
entity.setMetadata(PACKET_DUPLICATOR_FIXER, new FixedMetadataValue(plugin, "fixed"));
165157
}
166158

‎src/main/java/studio/magemonkey/divinity/manager/listener/ListenerManager.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import org.jetbrains.annotations.NotNull;
44
import studio.magemonkey.codex.manager.api.Loadable;
55
import studio.magemonkey.divinity.Divinity;
6-
import studio.magemonkey.divinity.config.Config;
7-
import studio.magemonkey.divinity.config.EngineCfg;
86
import studio.magemonkey.divinity.hooks.HookListener;
97
import studio.magemonkey.divinity.manager.listener.object.*;
108
import studio.magemonkey.divinity.stats.items.ItemStats;
@@ -47,13 +45,8 @@ public void setup() {
4745
this.lisDynamic = new DynamicStatListener(this.plugin);
4846
this.lisDynamic.registerListeners();
4947

50-
if(!EngineCfg.LEGACY_COMBAT) {
51-
this.lisQuantum = new VanillaWrapperListener(this.plugin);
52-
this.lisQuantum.registerListeners();
53-
Divinity.getInstance().getLogger().info("Loaded " + this.lisQuantum.getClass().getSimpleName());
54-
} else {
55-
Divinity.getInstance().getLogger().info("Skipped " + VanillaWrapperListener.class.getSimpleName() + " due to legacy combat being enabled.");
56-
}
48+
this.lisQuantum = new VanillaWrapperListener(this.plugin);
49+
this.lisQuantum.registerListeners();
5750

5851
this.updater = new ItemUpdaterListener(this.plugin);
5952
this.updater.registerListeners();

‎src/main/java/studio/magemonkey/divinity/manager/listener/object/DynamicStatListener.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.jetbrains.annotations.Nullable;
1414
import studio.magemonkey.codex.manager.IListener;
1515
import studio.magemonkey.divinity.Divinity;
16-
import studio.magemonkey.divinity.config.EngineCfg;
1716
import studio.magemonkey.divinity.stats.items.ItemStats;
1817
import studio.magemonkey.divinity.stats.items.api.DynamicStat;
1918

@@ -28,22 +27,19 @@ public DynamicStatListener(@NotNull Divinity plugin) {
2827
}
2928

3029
public static void updateItem(@Nullable Player p, @NotNull ItemStack item) {
31-
if(EngineCfg.FULL_LEGACY) return;
3230
for (DynamicStat<?> dynamicStat : ItemStats.getDynamicStats()) {
3331
dynamicStat.updateItem(p, item);
3432
}
3533
}
3634

3735
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
3836
public void onDrop(PlayerDropItemEvent e) {
39-
if(EngineCfg.FULL_LEGACY) return;
4037
ItemStack item = e.getItemDrop().getItemStack();
4138
updateItem(null, item);
4239
}
4340

4441
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
4542
public void onPick(EntityPickupItemEvent e) {
46-
if(EngineCfg.FULL_LEGACY) return;
4743
LivingEntity entity = e.getEntity();
4844
if (!(entity instanceof Player)) return;
4945

@@ -54,7 +50,6 @@ public void onPick(EntityPickupItemEvent e) {
5450

5551
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
5652
public void onInvOpen(InventoryOpenEvent e) {
57-
if(EngineCfg.FULL_LEGACY) return;
5853
List<ItemStack> list = new ArrayList<>();
5954
Player player = (Player) e.getPlayer();
6055

@@ -69,7 +64,6 @@ public void onInvOpen(InventoryOpenEvent e) {
6964

7065
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
7166
public void onInvClose(InventoryCloseEvent e) {
72-
if(EngineCfg.FULL_LEGACY) return;
7367
Player player = (Player) e.getPlayer();
7468

7569
List<ItemStack> list = new ArrayList<>();

‎src/main/java/studio/magemonkey/divinity/manager/listener/object/ItemUpdaterListener.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import studio.magemonkey.codex.manager.IListener;
2626
import studio.magemonkey.codex.util.DataUT;
2727
import studio.magemonkey.divinity.Divinity;
28-
import studio.magemonkey.divinity.config.EngineCfg;
2928
import studio.magemonkey.divinity.stats.items.ItemStats;
3029

3130
public class ItemUpdaterListener extends IListener<Divinity> {
@@ -94,7 +93,6 @@ public void join(PlayerJoinEvent event) {
9493
}
9594

9695
public void update(ItemStack item, @Nullable Player player) {
97-
if(EngineCfg.LEGACY_COMBAT ||EngineCfg.FULL_LEGACY) return;
9896
if (item == null || item.getType() == Material.AIR) return;
9997

10098
ItemType itemType = CodexEngine.get().getItemManager().getMainItemType(item);

‎src/main/java/studio/magemonkey/divinity/modules/ModuleItem.java‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package studio.magemonkey.divinity.modules;
22

33
import org.apache.commons.lang3.ArrayUtils;
4-
import org.bukkit.Bukkit;
54
import org.bukkit.Color;
65
import org.bukkit.Material;
76
import org.bukkit.NamespacedKey;
87
import org.bukkit.attribute.Attribute;
98
import org.bukkit.attribute.AttributeModifier;
109
import org.bukkit.configuration.InvalidConfigurationException;
1110
import org.bukkit.enchantments.Enchantment;
12-
import org.bukkit.inventory.EquipmentSlot;
1311
import org.bukkit.inventory.ItemFlag;
1412
import org.bukkit.inventory.ItemStack;
1513
import org.bukkit.inventory.meta.*;
@@ -137,25 +135,16 @@ public ModuleItem(@NotNull Divinity plugin, @NotNull JYML cfg, @NotNull QModuleD
137135

138136
this.attributes = new HashMap<>();
139137
for (String attr : cfg.getSection("attributes")) {
140-
String[] attrData = cfg.getString("attributes." + attr, "").split(":");
141-
double value = Double.parseDouble(attrData[0]);
142-
String operation = attrData.length > 1 ? attrData[1] : "ADD_NUMBER";
143-
String equipmentSlot = attrData.length > 2 ? attrData[2] : null;
144-
NBTAttribute nbtAttr = NBTAttribute.valueOf(attr.toUpperCase());
145-
146-
// Check attribute through compat support
147-
AttributeModifier attrModifier = VersionManager.getCompat().createAttributeModifier(nbtAttr, value, AttributeModifier.Operation.valueOf(operation));
138+
String[] attrData = cfg.getString("attributes." + attr, "").split(":");
139+
double value = Double.parseDouble(attrData[0]);
140+
String operation = attrData.length > 1 ? attrData[1] : "ADD_NUMBER";
141+
NBTAttribute nbtAttr = NBTAttribute.valueOf(attr.toUpperCase());
142+
AttributeModifier attrModifier = VersionManager.getCompat()
143+
.createAttributeModifier(nbtAttr, value, AttributeModifier.Operation.valueOf(operation));
148144
if (attrModifier == null) {
149145
Codex.warn("Invalid attribute provided: " + attr + " (" + cfg.getFile().getName() + ")");
150146
continue;
151147
}
152-
// If everything was fine and equipmentslot != null, recreate the modifier including the equipment slot
153-
if(equipmentSlot != null) {
154-
EquipmentSlot slot = EquipmentSlot.valueOf(equipmentSlot.toUpperCase());
155-
attrModifier = new AttributeModifier(attrModifier.getUniqueId(), attrModifier.getName(), attrModifier.getAmount(), attrModifier.getOperation(), slot);
156-
// Debug
157-
Bukkit.getLogger().info("Registered attribute " + nbtAttr.name() + " with value " + value + ", operation " + operation + " and equipment slot " + equipmentSlot + " for item " + this.getId());
158-
}
159148
this.attributes.put(nbtAttr.getAttribute(), attrModifier);
160149
}
161150

@@ -288,7 +277,6 @@ protected ItemStack build(@NotNull ItemStack item) {
288277

289278
for (Map.Entry<Attribute, AttributeModifier> attribute : this.attributes.entrySet()) {
290279
if (attribute != null) {
291-
AttributeModifier mod = new AttributeModifier(attribute.getValue().getName(), attribute.getValue().getAmount(), attribute.getValue().getOperation());
292280
meta.addAttributeModifier(attribute.getKey(), attribute.getValue());
293281
}
294282
}

‎src/main/java/studio/magemonkey/divinity/stats/EntityStats.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,6 @@ private void updateInventory() {
438438
}
439439

440440
public void updateAll() {
441-
if(EngineCfg.LEGACY_COMBAT) return;
442441
if (!EngineCfg.ATTRIBUTES_EFFECTIVE_FOR_MOBS && !this.isPlayer()) {
443442
return;
444443
}

‎src/main/java/studio/magemonkey/divinity/stats/items/ItemStats.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import studio.magemonkey.codex.modules.IModule;
2020
import studio.magemonkey.codex.util.DataUT;
2121
import studio.magemonkey.divinity.Divinity;
22-
import studio.magemonkey.divinity.config.EngineCfg;
2322
import studio.magemonkey.divinity.modules.api.QModuleDrop;
2423
import studio.magemonkey.divinity.stats.items.api.DuplicableItemLoreStat;
2524
import studio.magemonkey.divinity.stats.items.api.DynamicStat;
@@ -308,8 +307,6 @@ public static boolean hasStat(@NotNull ItemStack item, @Nullable Player player,
308307
// ----------------------------------------------------------------- //
309308

310309
public static void updateVanillaAttributes(@NotNull ItemStack item, @Nullable Player player) {
311-
if(EngineCfg.FULL_LEGACY || EngineCfg.LEGACY_COMBAT) return;
312-
313310
addAttribute(item, player, NBTAttribute.MAX_HEALTH, getStat(item, player, TypedStat.Type.MAX_HEALTH));
314311
addAttribute(item, player, NBTAttribute.MOVEMENT_SPEED, getStat(item, player, TypedStat.Type.MOVEMENT_SPEED));
315312
addAttribute(item, player, NBTAttribute.ATTACK_SPEED, getStat(item, player, TypedStat.Type.ATTACK_SPEED));
@@ -347,7 +344,6 @@ private static void addAttribute(@NotNull ItemStack item,
347344
@Nullable Player player,
348345
@NotNull NBTAttribute att,
349346
double value) {
350-
//if(EngineCfg.LEGACY_COMBAT) return;
351347
ItemMeta meta = item.getItemMeta();
352348
if (meta == null) return;
353349

‎src/main/resources/engine.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ attributes:
6363
# When enabled, allows to hold in hand items with requirements that player don't meet.
6464
# Even when this is 'true', item attributes won't be applied to a player until he meet the requirements.
6565
allow-hold-items-you-cant-use: false
66-
# When enabled, hides attributes and enchantments by default on all custom items.
67-
hide-flags: true
6866

6967
combat:
7068
# Whether to use the old combat formula for calculating defenses

0 commit comments

Comments
 (0)