Skip to content

Commit

Permalink
Finish com.sk89q -> org.enginehub migration
Browse files Browse the repository at this point in the history
  • Loading branch information
me4502 committed Aug 8, 2020
1 parent 09401de commit e8e6db2
Show file tree
Hide file tree
Showing 410 changed files with 2,831 additions and 2,832 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/LibsConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ fun Project.applyLibrariesConfiguration() {
exclude(dependency("com.google.code.findbugs:jsr305:1.3.9"))
}

relocate("org.enginehub.jinglenote", "com.sk89q.craftbook.util.jinglenote")
relocate("org.enginehub.squirrelid", "com.sk89q.craftbook.util.profile")
relocate("org.enginehub.jinglenote", "org.enginehub.craftbook.util.jinglenote")
relocate("org.enginehub.squirrelid", "org.enginehub.craftbook.util.profile")
}
val altConfigFiles = { artifactType: String ->
val deps = configurations["shade"].incoming.dependencies
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/PlatformConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ fun Project.applyShadowConfiguration() {
include(project(":craftbook-libs:core"))
include(project(":craftbook-core"))

relocate("org.enginehub.jinglenote", "com.sk89q.craftbook.util.jinglenote")
relocate("org.enginehub.squirrelid", "com.sk89q.craftbook.util.profile")
relocate("org.enginehub.jinglenote", "org.enginehub.craftbook.util.jinglenote")
relocate("org.enginehub.squirrelid", "org.enginehub.craftbook.util.profile")
}
exclude("GradleStart**")
exclude(".cache")
Expand Down
4 changes: 2 additions & 2 deletions craftbook-bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ tasks.named<Jar>("jar") {

tasks.named<ShadowJar>("shadowJar") {
dependencies {
relocate("org.bstats", "com.sk89q.craftbook.bukkit.bstats") {
relocate("org.bstats", "org.enginehub.craftbook.bukkit.bstats") {
include(dependency("org.bstats:bstats-bukkit:1.7"))
}
relocate ("io.papermc.lib", "com.sk89q.craftbook.bukkit.paperlib") {
relocate ("io.papermc.lib", "org.enginehub.craftbook.bukkit.paperlib") {
include(dependency("io.papermc:paperlib:1.0.4"))
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.bukkit.CraftBookPlugin;
import org.enginehub.craftbook.bukkit.CraftBookPlugin;
import com.sk89q.worldedit.command.util.PermissionCondition;
import com.sk89q.worldedit.internal.command.CommandUtil;
import com.sk89q.worldedit.util.formatting.text.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.util.TextUtil;
import org.enginehub.craftbook.util.TextUtil;
import com.sk89q.worldedit.util.formatting.text.Component;
import com.sk89q.worldedit.util.formatting.text.TextComponent;
import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.YamlConfiguration;
import com.sk89q.craftbook.bukkit.BukkitConfiguration;
import org.enginehub.craftbook.YamlConfiguration;
import org.enginehub.craftbook.bukkit.BukkitConfiguration;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.bukkit.BukkitCraftBookPlatform;
import org.enginehub.craftbook.bukkit.BukkitCraftBookPlatform;

import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.CraftBookPlatform;
import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.CraftBookPlatform;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.mechanic.CraftBookMechanic;
import com.sk89q.craftbook.mechanic.MechanicType;
import org.enginehub.craftbook.mechanic.CraftBookMechanic;
import org.enginehub.craftbook.mechanic.MechanicType;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.enginehub.craftbook.internal.util;

import com.sk89q.craftbook.mechanic.MechanicType;
import org.enginehub.craftbook.mechanic.MechanicType;

import java.io.FileWriter;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook;
package org.enginehub.craftbook;

import com.sk89q.craftbook.bukkit.CraftBookPlugin;
import com.sk89q.craftbook.mechanic.CraftBookMechanic;
import com.sk89q.craftbook.mechanic.MechanicType;
import com.sk89q.craftbook.mechanic.exception.InvalidMechanismException;
import com.sk89q.craftbook.mechanic.exception.MechanicInitializationException;
import org.enginehub.craftbook.bukkit.CraftBookPlugin;
import org.enginehub.craftbook.mechanic.CraftBookMechanic;
import org.enginehub.craftbook.mechanic.MechanicType;
import org.enginehub.craftbook.mechanic.exception.InvalidMechanismException;
import org.enginehub.craftbook.mechanic.exception.MechanicInitializationException;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.event.Listener;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook;
package org.enginehub.craftbook;

import com.sk89q.craftbook.mechanics.variables.VariableKey;
import com.sk89q.craftbook.mechanics.variables.VariableManager;
import com.sk89q.craftbook.util.ParsingUtil;
import org.enginehub.craftbook.mechanics.variables.VariableKey;
import org.enginehub.craftbook.mechanics.variables.VariableManager;
import org.enginehub.craftbook.util.ParsingUtil;
import io.papermc.lib.PaperLib;
import org.apache.commons.lang.Validate;
import org.bukkit.Material;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook;
package org.enginehub.craftbook;

import com.google.common.collect.Lists;
import com.sk89q.craftbook.bukkit.CraftBookPlugin;
import org.enginehub.craftbook.bukkit.CraftBookPlugin;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import org.bukkit.entity.Player;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook;
package org.enginehub.craftbook;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.sk89q.craftbook.bukkit.commands.CraftBookCommands;
import com.sk89q.craftbook.command.argument.RegistryConverter;
import com.sk89q.craftbook.command.argument.WorldConverter;
import com.sk89q.craftbook.mechanic.MechanicCommandRegistrar;
import org.enginehub.craftbook.bukkit.commands.CraftBookCommands;
import org.enginehub.craftbook.command.argument.RegistryConverter;
import org.enginehub.craftbook.command.argument.WorldConverter;
import org.enginehub.craftbook.mechanic.MechanicCommandRegistrar;
import com.sk89q.worldedit.command.argument.Arguments;
import com.sk89q.worldedit.command.argument.VectorConverter;
import com.sk89q.worldedit.command.util.PermissionCondition;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;
package org.enginehub.craftbook.bukkit;

import static com.google.common.base.Preconditions.checkNotNull;

import com.sk89q.bukkit.util.CommandInspector;
import com.sk89q.craftbook.util.TextUtil;
import org.enginehub.craftbook.util.TextUtil;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.platform.Actor;
import org.bukkit.command.Command;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;
package org.enginehub.craftbook.bukkit;

import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.YamlConfiguration;
import com.sk89q.craftbook.mechanic.MechanicType;
import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.YamlConfiguration;
import org.enginehub.craftbook.mechanic.MechanicType;
import com.sk89q.util.yaml.YAMLProcessor;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;
package org.enginehub.craftbook.bukkit;

import static com.sk89q.worldedit.util.formatting.WorldEditText.reduceToText;

import com.sk89q.bukkit.util.CommandInfo;
import com.sk89q.bukkit.util.CommandRegistration;
import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.CraftBookPlatform;
import com.sk89q.craftbook.YamlConfiguration;
import com.sk89q.craftbook.mechanic.BukkitMechanicManager;
import com.sk89q.craftbook.mechanic.MechanicManager;
import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.CraftBookPlatform;
import org.enginehub.craftbook.YamlConfiguration;
import org.enginehub.craftbook.mechanic.BukkitMechanicManager;
import org.enginehub.craftbook.mechanic.MechanicManager;
import com.sk89q.util.yaml.YAMLFormat;
import com.sk89q.util.yaml.YAMLProcessor;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.command.util.PermissionCondition;
import com.sk89q.worldedit.util.report.ReportList;
import com.sk89q.craftbook.util.profile.cache.ProfileCache;
import com.sk89q.craftbook.util.profile.resolver.BukkitPlayerService;
import com.sk89q.craftbook.util.profile.resolver.CacheForwardingService;
import com.sk89q.craftbook.util.profile.resolver.CombinedProfileService;
import com.sk89q.craftbook.util.profile.resolver.HttpRepositoryService;
import com.sk89q.craftbook.util.profile.resolver.ProfileService;
import com.sk89q.craftbook.util.profile.resolver.PaperPlayerService;
import org.enginehub.craftbook.util.profile.cache.ProfileCache;
import org.enginehub.craftbook.util.profile.resolver.BukkitPlayerService;
import org.enginehub.craftbook.util.profile.resolver.CacheForwardingService;
import org.enginehub.craftbook.util.profile.resolver.CombinedProfileService;
import org.enginehub.craftbook.util.profile.resolver.HttpRepositoryService;
import org.enginehub.craftbook.util.profile.resolver.ProfileService;
import org.enginehub.craftbook.util.profile.resolver.PaperPlayerService;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.enginehub.piston.CommandManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;
package org.enginehub.craftbook.bukkit;

import com.sk89q.craftbook.CraftBookPlayer;
import com.sk89q.craftbook.LanguageManager;
import com.sk89q.craftbook.util.TextUtil;
import org.enginehub.craftbook.CraftBookPlayer;
import org.enginehub.craftbook.LanguageManager;
import org.enginehub.craftbook.util.TextUtil;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.bukkit.BukkitPlayer;
import com.sk89q.worldedit.util.HandSide;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;
package org.enginehub.craftbook.bukkit;

import com.google.common.base.Joiner;
import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.CraftBookManifest;
import com.sk89q.craftbook.CraftBookPlatform;
import com.sk89q.craftbook.CraftBookPlayer;
import com.sk89q.craftbook.LanguageManager;
import com.sk89q.craftbook.PlatformCommandManager;
import com.sk89q.craftbook.mechanic.CraftBookMechanic;
import com.sk89q.craftbook.mechanics.variables.VariableManager;
import com.sk89q.craftbook.st.MechanicClock;
import com.sk89q.craftbook.st.SelfTriggeringManager;
import com.sk89q.craftbook.util.ArrayUtil;
import com.sk89q.craftbook.util.RegexUtil;
import com.sk89q.craftbook.util.UUIDMappings;
import com.sk89q.craftbook.util.companion.CompanionPlugins;
import com.sk89q.craftbook.util.persistent.PersistentStorage;
import com.sk89q.craftbook.util.profile.Profile;
import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.CraftBookManifest;
import org.enginehub.craftbook.CraftBookPlatform;
import org.enginehub.craftbook.CraftBookPlayer;
import org.enginehub.craftbook.LanguageManager;
import org.enginehub.craftbook.PlatformCommandManager;
import org.enginehub.craftbook.mechanic.CraftBookMechanic;
import org.enginehub.craftbook.mechanics.variables.VariableManager;
import org.enginehub.craftbook.st.MechanicClock;
import org.enginehub.craftbook.st.SelfTriggeringManager;
import org.enginehub.craftbook.util.ArrayUtil;
import org.enginehub.craftbook.util.RegexUtil;
import org.enginehub.craftbook.util.UUIDMappings;
import org.enginehub.craftbook.util.companion.CompanionPlugins;
import org.enginehub.craftbook.util.persistent.PersistentStorage;
import org.enginehub.craftbook.util.profile.Profile;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import com.sk89q.wepif.PermissionsResolverManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit;

import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.mechanics.minecart.blocks.CartBlockMechanism;
import com.sk89q.craftbook.mechanics.minecart.blocks.CartMechanismBlocks;
import com.sk89q.craftbook.mechanics.minecart.events.CartBlockEnterEvent;
import com.sk89q.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
import com.sk89q.craftbook.mechanics.minecart.events.CartBlockRedstoneEvent;
import com.sk89q.craftbook.util.EventUtil;
import com.sk89q.craftbook.util.HistoryHashMap;
import com.sk89q.craftbook.util.LocationUtil;
import com.sk89q.craftbook.util.SignUtil;
import com.sk89q.craftbook.util.events.SignClickEvent;
import com.sk89q.craftbook.util.events.SourcedBlockRedstoneEvent;
import com.sk89q.craftbook.mechanic.exception.InvalidMechanismException;
package org.enginehub.craftbook.bukkit;

import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.mechanics.minecart.blocks.CartBlockMechanism;
import org.enginehub.craftbook.mechanics.minecart.blocks.CartMechanismBlocks;
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockEnterEvent;
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockImpactEvent;
import org.enginehub.craftbook.mechanics.minecart.events.CartBlockRedstoneEvent;
import org.enginehub.craftbook.util.EventUtil;
import org.enginehub.craftbook.util.HistoryHashMap;
import org.enginehub.craftbook.util.LocationUtil;
import org.enginehub.craftbook.util.SignUtil;
import org.enginehub.craftbook.util.events.SignClickEvent;
import org.enginehub.craftbook.util.events.SourcedBlockRedstoneEvent;
import org.enginehub.craftbook.mechanic.exception.InvalidMechanismException;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit.commands;
package org.enginehub.craftbook.bukkit.commands;

import com.google.common.collect.Lists;
import com.google.common.io.Files;
import com.sk89q.craftbook.CraftBook;
import com.sk89q.craftbook.CraftBookPlayer;
import com.sk89q.craftbook.bukkit.CraftBookPlugin;
import com.sk89q.craftbook.bukkit.report.GlobalConfigReport;
import com.sk89q.craftbook.bukkit.report.LoadedICsReport;
import com.sk89q.craftbook.bukkit.report.MechanicReport;
import com.sk89q.craftbook.exception.CraftBookException;
import com.sk89q.craftbook.mechanic.MechanicCommands;
import com.sk89q.craftbook.util.ItemSyntax;
import org.enginehub.craftbook.CraftBook;
import org.enginehub.craftbook.CraftBookPlayer;
import org.enginehub.craftbook.bukkit.CraftBookPlugin;
import org.enginehub.craftbook.bukkit.report.GlobalConfigReport;
import org.enginehub.craftbook.bukkit.report.LoadedICsReport;
import org.enginehub.craftbook.bukkit.report.MechanicReport;
import org.enginehub.craftbook.exception.CraftBookException;
import org.enginehub.craftbook.mechanic.MechanicCommands;
import org.enginehub.craftbook.util.ItemSyntax;
import com.sk89q.worldedit.bukkit.BukkitAdapter;
import com.sk89q.worldedit.command.util.CommandPermissions;
import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit.report;
package org.enginehub.craftbook.bukkit.report;

import com.sk89q.craftbook.CraftBook;
import org.enginehub.craftbook.CraftBook;
import com.sk89q.worldedit.util.report.DataReport;
import com.sk89q.worldedit.util.report.HierarchyObjectReport;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
* see <http://www.gnu.org/licenses/>.
*/

package com.sk89q.craftbook.bukkit.report;
package org.enginehub.craftbook.bukkit.report;

import com.sk89q.craftbook.mechanics.ic.IC;
import com.sk89q.craftbook.mechanics.ic.ICManager;
import org.enginehub.craftbook.mechanics.ic.IC;
import org.enginehub.craftbook.mechanics.ic.ICManager;
import com.sk89q.worldedit.util.report.DataReport;
import org.bukkit.Location;

Expand Down
Loading

0 comments on commit e8e6db2

Please sign in to comment.