Upstream
/
ViaRewind-Legacy-Support
mirror of https://github.com/ViaVersion/ViaRewind-Legacy-Support.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rebase "de.gerrygames.viarewind" -> "com.viaversion.viarewind" 

Fixed gradle building
This commit is contained in:
FlorianMichael 2023-09-22 14:13:03 +02:00
parent 046ad4961d
commit 7277ae88da
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
16 changed files with 99 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@ -18,16 +18,28 @@ repositories {
}
}
version = project.maven_version
group = project.maven_group
dependencies {
compileOnly "com.viaversion:viaversion-api:4.6.2"
compileOnly "org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT"
}
group = "de.gerrygames"
version = "1.5.0-SNAPSHOT"
description = "viarewind-legacy-support"
java.sourceCompatibility = JavaVersion.VERSION_1_8
processResources {
inputs.property "version", project.version
filesMatching("plugin.yml") {
expand "version": project.version
}
}
java {
withSourcesJar()
}
publishing {
publications {
maven(MavenPublication) {

8
gradle.properties Normal file
View File

@ -0,0 +1,8 @@
# gradle
org.gradle.jvmargs=-Xmx8G
org.gradle.parallel=true
# project
maven_version=1.5.0-SNAPSHOT
maven_group=com.viaversion

51
src/main/java/com/viaversion/viarewind/legacysupport/BukkitPlugin.java Normal file
View File

@ -0,0 +1,51 @@
package com.viaversion.viarewind.legacysupport;
import com.viaversion.viarewind.legacysupport.injector.BoundingBoxFixer;
import com.viaversion.viarewind.legacysupport.versioninfo.VersionInformer;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viarewind.legacysupport.listener.AreaEffectCloudListener;
import com.viaversion.viarewind.legacysupport.listener.BounceListener;
import com.viaversion.viarewind.legacysupport.listener.BrewingListener;
import com.viaversion.viarewind.legacysupport.listener.ElytraListener;
import com.viaversion.viarewind.legacysupport.listener.EnchantingListener;
import com.viaversion.viarewind.legacysupport.listener.SoundListener;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
public class BukkitPlugin extends JavaPlugin {
private static BukkitPlugin instance;
@Override
public void onEnable() {
instance = this;
saveDefaultConfig();
getConfig().options().copyDefaults(true);
saveConfig();
final FileConfiguration config = getConfig();
new BukkitRunnable() {
@Override
public void run() {
int serverProtocol = Via.getAPI().getServerVersion().lowestSupportedVersion();
if (serverProtocol == -1) return;
cancel();
if (serverProtocol > 5 && config.getBoolean("enchanting-gui-fix")) Bukkit.getPluginManager().registerEvents(new EnchantingListener(), BukkitPlugin.this);
if (serverProtocol > 78 && config.getBoolean("brewing-stand-gui-fix")) Bukkit.getPluginManager().registerEvents(new BrewingListener(), BukkitPlugin.this);
if (serverProtocol > 84 && config.getBoolean("lily-pad-fix")) BoundingBoxFixer.fixLilyPad();
if (serverProtocol > 404 && config.getBoolean("carpet-fix")) // 1.14+ only BoundingBoxFixer.fixCarpet();
if (serverProtocol > 48 && config.getBoolean("ladder-fix")) BoundingBoxFixer.fixLadder();
if (serverProtocol > 47 && config.getBoolean("sound-fix")) Bukkit.getPluginManager().registerEvents(new SoundListener(), BukkitPlugin.this);
if (serverProtocol > 5 && config.getBoolean("slime-fix")) Bukkit.getPluginManager().registerEvents(new BounceListener(), BukkitPlugin.this);
if (serverProtocol > 76 && config.getBoolean("elytra-fix")) Bukkit.getPluginManager().registerEvents(new ElytraListener(), BukkitPlugin.this);
if (serverProtocol > 54 && config.getBoolean("area-effect-cloud-particles")) Bukkit.getPluginManager().registerEvents(new AreaEffectCloudListener(), BukkitPlugin.this);
if (config.getBoolean("versioninfo.active")) new VersionInformer();
}
}.runTaskTimer(this, 1L, 1L);
}
public static BukkitPlugin getInstance() {
return instance;
}
}

8
src/main/java/de/gerrygames/viarewind/legacysupport/injector/BoundingBoxFixer.java → src/main/java/com/viaversion/viarewind/legacysupport/injector/BoundingBoxFixer.java
View File

@ -1,16 +1,14 @@
package de.gerrygames.viarewind.legacysupport.injector;
package com.viaversion.viarewind.legacysupport.injector;
import com.viaversion.viarewind.legacysupport.reflection.ReflectionAPI;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.BukkitPlugin;
import de.gerrygames.viarewind.legacysupport.reflection.ReflectionAPI;
import com.viaversion.viarewind.legacysupport.BukkitPlugin;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.stream.Stream;
public class BoundingBoxFixer {

6
src/main/java/de/gerrygames/viarewind/legacysupport/injector/NMSReflection.java → src/main/java/com/viaversion/viarewind/legacysupport/injector/NMSReflection.java
View File

@ -1,8 +1,8 @@
package de.gerrygames.viarewind.legacysupport.injector;
package com.viaversion.viarewind.legacysupport.injector;
import com.viaversion.viarewind.legacysupport.reflection.MethodSignature;
import com.viaversion.viarewind.legacysupport.reflection.ReflectionAPI;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.reflection.MethodSignature;
import de.gerrygames.viarewind.legacysupport.reflection.ReflectionAPI;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

4
src/main/java/de/gerrygames/viarewind/legacysupport/listener/AreaEffectCloudListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/AreaEffectCloudListener.java
View File

@ -1,7 +1,7 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.BukkitPlugin;
import com.viaversion.viarewind.legacysupport.BukkitPlugin;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Particle;

2
src/main/java/de/gerrygames/viarewind/legacysupport/listener/BounceListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/BounceListener.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viaversion.api.Via;
import org.bukkit.Material;

2
src/main/java/de/gerrygames/viarewind/legacysupport/listener/BrewingListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/BrewingListener.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viaversion.api.Via;
import org.bukkit.Material;

2
src/main/java/de/gerrygames/viarewind/legacysupport/listener/ElytraListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/ElytraListener.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viaversion.api.Via;
import org.bukkit.Location;

2
src/main/java/de/gerrygames/viarewind/legacysupport/listener/EnchantingListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/EnchantingListener.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viaversion.api.Via;
import org.bukkit.Location;

10
src/main/java/de/gerrygames/viarewind/legacysupport/listener/SoundListener.java → src/main/java/com/viaversion/viarewind/legacysupport/listener/SoundListener.java
View File

@ -1,10 +1,10 @@
package de.gerrygames.viarewind.legacysupport.listener;
package com.viaversion.viarewind.legacysupport.listener;
import com.viaversion.viarewind.legacysupport.reflection.MethodSignature;
import com.viaversion.viarewind.legacysupport.reflection.ReflectionAPI;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.BukkitPlugin;
import de.gerrygames.viarewind.legacysupport.injector.NMSReflection;
import de.gerrygames.viarewind.legacysupport.reflection.MethodSignature;
import de.gerrygames.viarewind.legacysupport.reflection.ReflectionAPI;
import com.viaversion.viarewind.legacysupport.BukkitPlugin;
import com.viaversion.viarewind.legacysupport.injector.NMSReflection;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Sound;

2
src/main/java/de/gerrygames/viarewind/legacysupport/reflection/MethodSignature.java → src/main/java/com/viaversion/viarewind/legacysupport/reflection/MethodSignature.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.reflection;
package com.viaversion.viarewind.legacysupport.reflection;
import java.util.Arrays;
import java.util.Objects;

2
src/main/java/de/gerrygames/viarewind/legacysupport/reflection/ReflectionAPI.java → src/main/java/com/viaversion/viarewind/legacysupport/reflection/ReflectionAPI.java
View File

@ -1,4 +1,4 @@
package de.gerrygames.viarewind.legacysupport.reflection;
package com.viaversion.viarewind.legacysupport.reflection;
import sun.reflect.ReflectionFactory;

4
src/main/java/de/gerrygames/viarewind/legacysupport/versioninfo/VersionInformer.java → src/main/java/com/viaversion/viarewind/legacysupport/versioninfo/VersionInformer.java
View File

@ -1,7 +1,7 @@
package de.gerrygames.viarewind.legacysupport.versioninfo;
package com.viaversion.viarewind.legacysupport.versioninfo;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.BukkitPlugin;
import com.viaversion.viarewind.legacysupport.BukkitPlugin;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.event.EventHandler;

60
src/main/java/de/gerrygames/viarewind/legacysupport/BukkitPlugin.java
View File

@ -1,60 +0,0 @@
package de.gerrygames.viarewind.legacysupport;
import com.viaversion.viaversion.api.Via;
import de.gerrygames.viarewind.legacysupport.injector.BoundingBoxFixer;
import de.gerrygames.viarewind.legacysupport.listener.AreaEffectCloudListener;
import de.gerrygames.viarewind.legacysupport.listener.BounceListener;
import de.gerrygames.viarewind.legacysupport.listener.BrewingListener;
import de.gerrygames.viarewind.legacysupport.listener.ElytraListener;
import de.gerrygames.viarewind.legacysupport.listener.EnchantingListener;
import de.gerrygames.viarewind.legacysupport.listener.SoundListener;
import de.gerrygames.viarewind.legacysupport.versioninfo.VersionInformer;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
public class BukkitPlugin extends JavaPlugin {
private static BukkitPlugin instance;
@Override
public void onEnable() {
instance = this;
saveDefaultConfig();
getConfig().options().copyDefaults(true);
saveConfig();
final FileConfiguration config = getConfig();
new BukkitRunnable() {
@Override
public void run() {
int serverProtocol = Via.getAPI().getServerVersion().lowestSupportedVersion();
if (serverProtocol == -1) return;
cancel();
if (serverProtocol > 5 && config.getBoolean("enchanting-gui-fix"))
Bukkit.getPluginManager().registerEvents(new EnchantingListener(), BukkitPlugin.this);
if (serverProtocol > 78 && config.getBoolean("brewing-stand-gui-fix"))
Bukkit.getPluginManager().registerEvents(new BrewingListener(), BukkitPlugin.this);
if (serverProtocol > 84 && config.getBoolean("lily-pad-fix"))
BoundingBoxFixer.fixLilyPad();
if (serverProtocol > 404 && config.getBoolean("carpet-fix")) // 1.14+ only
BoundingBoxFixer.fixCarpet();
if (serverProtocol > 48 && config.getBoolean("ladder-fix"))
BoundingBoxFixer.fixLadder();
if (serverProtocol > 47 && config.getBoolean("sound-fix"))
Bukkit.getPluginManager().registerEvents(new SoundListener(), BukkitPlugin.this);
if (serverProtocol > 5 && config.getBoolean("slime-fix"))
Bukkit.getPluginManager().registerEvents(new BounceListener(), BukkitPlugin.this);
if (serverProtocol > 76 && config.getBoolean("elytra-fix"))
Bukkit.getPluginManager().registerEvents(new ElytraListener(), BukkitPlugin.this);
if (serverProtocol > 54 && config.getBoolean("area-effect-cloud-particles"))
Bukkit.getPluginManager().registerEvents(new AreaEffectCloudListener(), BukkitPlugin.this);
if (config.getBoolean("versioninfo.active"))
new VersionInformer();
}
}.runTaskTimer(this, 1L, 1L);
}
public static BukkitPlugin getInstance() {
return instance;
}
}

8
src/main/resources/plugin.yml
View File

@ -1,9 +1,9 @@
name: ViaRewind-Legacy-Support
version: ${project.version}
main: de.gerrygames.viarewind.legacysupport.BukkitPlugin
version: ${version}
main: com.viaversion.viarewind.legacysupport.BukkitPlugin
api-version: 1.13
authors: [Gerrygames]
website: https://github.com/Gerrygames
website: https://github.com/ViaVersion/ViaRewind-Legacy-Support
depend: [ViaVersion]
depend: [ViaVersion]