From e2e3bdbbda54a6d332b72853914acecbe78b982c Mon Sep 17 00:00:00 2001 From: Zrips Date: Sun, 14 Oct 2018 17:02:14 +0300 Subject: [PATCH] Lets keep subtype in 1.13 --- .../jobs/actions/BlockActionInfo.java | 4 --- .../gamingmesh/jobs/config/ConfigManager.java | 31 ------------------- 2 files changed, 35 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java b/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java index 1106d7bf..268e2ba1 100644 --- a/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java +++ b/src/main/java/com/gamingmesh/jobs/actions/BlockActionInfo.java @@ -21,10 +21,8 @@ package com.gamingmesh.jobs.actions; import org.bukkit.Material; import org.bukkit.block.Block; -import com.gamingmesh.jobs.Jobs; import com.gamingmesh.jobs.container.ActionInfo; import com.gamingmesh.jobs.container.ActionType; -import com.gamingmesh.jobs.CMILib.VersionChecker.Version; public class BlockActionInfo extends MaterialActionInfo implements ActionInfo { public BlockActionInfo(Block block, ActionType type) { @@ -32,8 +30,6 @@ public class BlockActionInfo extends MaterialActionInfo implements ActionInfo { } private static byte getData(Block block) { - if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) - return 0; @SuppressWarnings("deprecation") byte data = block.getData(); if (block.getType() == Material.COCOA) diff --git a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java index 8d8b361e..f499b1f7 100644 --- a/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/ConfigManager.java @@ -1125,37 +1125,6 @@ public class ConfigManager { } } - switch (actionType) { - case BREED: - case CUSTOMKILL: - case BREW: - case EXPLORE: - case FISH: - case KILL: - case MILK: - case MMKILL: - case SHEAR: - case TAME: - break; - case TNTBREAK: - case SMELT: - case REPAIR: - case PLACE: - case ENCHANT: - case DYE: - case EAT: - case DRINK: - case CRAFT: - case BREAK: - if (Jobs.getVersionCheckManager().getVersion().isEqualOrHigher(Version.v1_13_R1)) { - subType = ""; - meta = ""; - } - break; - default: - break; - } - jobInfo.add(new JobInfo(actionType, id, meta, type + subType, income, incomeEquation, experience, expEquation, pointsEquation, points, fromlevel, untilLevel, section.getCurrentPath(), softIncomeLimit, softExpLimit, softPointsLimit)); }