Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Switched proxy interfaces to kotlin

Browse Source
This commit is contained in:
Auxilor
2021-08-07 13:02:44 +01:00
parent 86a948738f
commit f64d69f084
29 changed files with 88 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/ChatComponent.java
View File

@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.willfp.eco.core.display.Display;
import com.willfp.eco.proxy.ChatComponentProxy;
import proxy.ChatComponentProxy;
import net.minecraft.server.v1_16_R3.ChatBaseComponent;
import net.minecraft.server.v1_16_R3.ChatHoverable;
import net.minecraft.server.v1_16_R3.ChatMessage;
@@ -22,10 +22,10 @@ import java.util.Arrays;
public final class ChatComponent implements ChatComponentProxy {
@Override
public Object modifyComponent(@NotNull final Object object,
public Object modifyComponent(@NotNull final Object obj,
@NotNull final Player player) {
if (!(object instanceof IChatBaseComponent chatComponent)) {
return object;
if (!(obj instanceof IChatBaseComponent chatComponent)) {
return obj;
}
for (IChatBaseComponent iChatBaseComponent : chatComponent) {

2
eco-core/core-nms/v1_16_R3/src/main/kotlin/AutoCraft.kt
View File

@@ -1,5 +1,5 @@
import com.willfp.eco.proxy.AutoCraftProxy
import proxy.AutoCraftProxy
import net.minecraft.server.v1_16_R3.MinecraftKey
import net.minecraft.server.v1_16_R3.PacketPlayOutAutoRecipe

2
eco-core/core-nms/v1_16_R3/src/main/kotlin/BlockBreak.kt
View File

@@ -1,5 +1,5 @@
import com.willfp.eco.proxy.BlockBreakProxy
import proxy.BlockBreakProxy
import net.minecraft.server.v1_16_R3.BlockPosition
import org.bukkit.block.Block
import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer

2
eco-core/core-nms/v1_16_R3/src/main/kotlin/FastItemStackFactory.kt
View File

@@ -1,6 +1,6 @@
import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.proxy.FastItemStackFactoryProxy
import proxy.FastItemStackFactoryProxy
import com.willfp.eco.proxy.v1_16_R3.NMSFastItemStack
import org.bukkit.inventory.ItemStack

2
eco-core/core-nms/v1_16_R3/src/main/kotlin/Skull.kt
View File

@@ -1,7 +1,7 @@
import com.mojang.authlib.GameProfile
import com.mojang.authlib.properties.Property
import com.willfp.eco.proxy.SkullProxy
import proxy.SkullProxy
import org.bukkit.inventory.meta.SkullMeta
import java.lang.reflect.Method
import java.util.*

2
eco-core/core-nms/v1_16_R3/src/main/kotlin/VillagerTrade.kt
View File

@@ -1,6 +1,6 @@
import com.willfp.eco.core.display.Display
import com.willfp.eco.proxy.VillagerTradeProxy
import proxy.VillagerTradeProxy
import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftMerchantRecipe
import org.bukkit.entity.Player
import org.bukkit.inventory.MerchantRecipe

8
eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/ChatComponent.java
View File

@@ -5,7 +5,7 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.willfp.eco.core.display.Display;
import com.willfp.eco.proxy.ChatComponentProxy;
import proxy.ChatComponentProxy;
import net.minecraft.nbt.TagParser;
import net.minecraft.network.chat.BaseComponent;
import net.minecraft.network.chat.Component;
@@ -22,10 +22,10 @@ import java.util.Arrays;
public final class ChatComponent implements ChatComponentProxy {
@Override
public Object modifyComponent(@NotNull final Object object,
public Object modifyComponent(@NotNull final Object obj,
@NotNull final Player player) {
if (!(object instanceof Component chatComponent)) {
return object;
if (!(obj instanceof Component chatComponent)) {
return obj;
}
for (Component iChatBaseComponent : chatComponent) {

2
eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/AutoCraft.kt
View File

@@ -1,8 +1,8 @@
package com.willfp.eco.proxy.v1_17_R1
import com.willfp.eco.proxy.AutoCraftProxy
import net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket
import net.minecraft.resources.ResourceLocation
import proxy.AutoCraftProxy
class AutoCraft : AutoCraftProxy {
@Throws(NoSuchFieldException::class, IllegalAccessException::class)

2
eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/BlockBreak.kt
View File

@@ -1,8 +1,8 @@
package com.willfp.eco.proxy.v1_17_R1
import com.willfp.eco.proxy.BlockBreakProxy
import org.bukkit.block.Block
import org.bukkit.entity.Player
import proxy.BlockBreakProxy
class BlockBreak : BlockBreakProxy {
override fun breakBlock(

2
eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/FastItemStackFactory.kt
View File

@@ -1,9 +1,9 @@
package com.willfp.eco.proxy.v1_17_R1
import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.proxy.FastItemStackFactoryProxy
import com.willfp.eco.proxy.v1_17_R1.fast.NMSFastItemStack
import org.bukkit.inventory.ItemStack
import proxy.FastItemStackFactoryProxy
class FastItemStackFactory : FastItemStackFactoryProxy {
override fun create(itemStack: ItemStack): FastItemStack {

2
eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/Skull.kt
View File

@@ -2,8 +2,8 @@ package com.willfp.eco.proxy.v1_17_R1
import com.mojang.authlib.GameProfile
import com.mojang.authlib.properties.Property
import com.willfp.eco.proxy.SkullProxy
import org.bukkit.inventory.meta.SkullMeta
import proxy.SkullProxy
import java.lang.reflect.Method
import java.util.*

2
eco-core/core-nms/v1_17_R1/src/main/kotlin/com/willfp/eco/proxy/v1_17_R1/VillagerTrade.kt
View File

@@ -1,11 +1,11 @@
package com.willfp.eco.proxy.v1_17_R1
import com.willfp.eco.core.display.Display
import com.willfp.eco.proxy.VillagerTradeProxy
import net.minecraft.world.item.trading.MerchantOffer
import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftMerchantRecipe
import org.bukkit.entity.Player
import org.bukkit.inventory.MerchantRecipe
import proxy.VillagerTradeProxy
import java.lang.reflect.Field
class VillagerTrade : VillagerTradeProxy {

2
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoHandler.kt
View File

@@ -31,7 +31,7 @@ import com.willfp.eco.internal.integrations.PlaceholderIntegrationPAPI
import com.willfp.eco.internal.logging.EcoLogger
import com.willfp.eco.internal.proxy.EcoProxyFactory
import com.willfp.eco.internal.scheduling.EcoScheduler
import com.willfp.eco.proxy.FastItemStackFactoryProxy
import proxy.FastItemStackFactoryProxy
import org.bstats.bukkit.Metrics
import org.bukkit.configuration.file.YamlConfiguration
import org.bukkit.inventory.ItemStack

6
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt
View File

@@ -9,9 +9,9 @@ import com.willfp.eco.core.integrations.antigrief.AntigriefManager
import com.willfp.eco.core.integrations.customitems.CustomItemsManager
import com.willfp.eco.core.integrations.mcmmo.McmmoManager
import com.willfp.eco.internal.drops.DropManager
import com.willfp.eco.proxy.BlockBreakProxy
import com.willfp.eco.proxy.FastItemStackFactoryProxy
import com.willfp.eco.proxy.SkullProxy
import proxy.BlockBreakProxy
import proxy.FastItemStackFactoryProxy
import proxy.SkullProxy
import com.willfp.eco.spigot.arrows.ArrowDataListener
import com.willfp.eco.spigot.display.*
import com.willfp.eco.spigot.drops.CollatedRunnable

2
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketAutoRecipe.kt
View File

@@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer
import com.comphenix.protocol.events.PacketEvent
import com.willfp.eco.core.AbstractPacketAdapter
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.proxy.AutoCraftProxy
import proxy.AutoCraftProxy
import org.bukkit.entity.Player
import java.lang.reflect.InvocationTargetException

2
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketChat.kt
View File

@@ -7,7 +7,7 @@ import com.comphenix.protocol.events.PacketEvent
import com.comphenix.protocol.wrappers.WrappedChatComponent
import com.willfp.eco.core.AbstractPacketAdapter
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.proxy.ChatComponentProxy
import proxy.ChatComponentProxy
import org.bukkit.entity.Player
class PacketChat(plugin: EcoPlugin) :

2
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.kt
View File

@@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer
import com.comphenix.protocol.events.PacketEvent
import com.willfp.eco.core.AbstractPacketAdapter
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.proxy.VillagerTradeProxy
import proxy.VillagerTradeProxy
import com.willfp.eco.util.NamespacedKeyUtils
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemFlag

8
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/AutoCraftProxy.java
View File

@@ -1,8 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.jetbrains.annotations.NotNull;
public interface AutoCraftProxy extends AbstractProxy {
void modifyPacket(@NotNull Object packet) throws NoSuchFieldException, IllegalAccessException;
}

11
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/BlockBreakProxy.java
View File

@@ -1,11 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public interface BlockBreakProxy extends AbstractProxy {
void breakBlock(@NotNull Player player,
@NotNull Block block);
}

11
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/ChatComponentProxy.java
View File

@@ -1,11 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
public interface ChatComponentProxy extends AbstractProxy {
Object modifyComponent(@NotNull Object object,
@NotNull Player player);
}

10
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/FastItemStackFactoryProxy.java
View File

@@ -1,10 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.fast.FastItemStack;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
public interface FastItemStackFactoryProxy extends AbstractProxy {
FastItemStack create(@NotNull ItemStack itemStack);
}

10
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/SkullProxy.java
View File

@@ -1,10 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.bukkit.inventory.meta.SkullMeta;
import org.jetbrains.annotations.NotNull;
public interface SkullProxy extends AbstractProxy {
void setSkullTexture(@NotNull SkullMeta meta,
@NotNull String base64);
}

11
eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/VillagerTradeProxy.java
View File

@@ -1,11 +0,0 @@
package com.willfp.eco.proxy;
import com.willfp.eco.core.proxy.AbstractProxy;
import org.bukkit.entity.Player;
import org.bukkit.inventory.MerchantRecipe;
import org.jetbrains.annotations.NotNull;
public interface VillagerTradeProxy extends AbstractProxy {
MerchantRecipe displayTrade(@NotNull MerchantRecipe recipe,
@NotNull Player player);
}

8
eco-core/core-proxy/src/main/kotlin/proxy/AutoCraftProxy.kt Normal file
View File

@@ -0,0 +1,8 @@
package proxy
import com.willfp.eco.core.proxy.AbstractProxy
interface AutoCraftProxy : AbstractProxy {
@Throws(NoSuchFieldException::class, IllegalAccessException::class)
fun modifyPacket(packet: Any)
}

12
eco-core/core-proxy/src/main/kotlin/proxy/BlockBreakProxy.kt Normal file
View File

@@ -0,0 +1,12 @@
package proxy
import com.willfp.eco.core.proxy.AbstractProxy
import org.bukkit.block.Block
import org.bukkit.entity.Player
interface BlockBreakProxy : AbstractProxy {
fun breakBlock(
player: Player,
block: Block
)
}

11
eco-core/core-proxy/src/main/kotlin/proxy/ChatComponentProxy.kt Normal file
View File

@@ -0,0 +1,11 @@
package proxy
import com.willfp.eco.core.proxy.AbstractProxy
import org.bukkit.entity.Player
interface ChatComponentProxy : AbstractProxy {
fun modifyComponent(
obj: Any,
player: Player
): Any?
}

9
eco-core/core-proxy/src/main/kotlin/proxy/FastItemStackFactoryProxy.kt Normal file
View File

@@ -0,0 +1,9 @@
package proxy
import com.willfp.eco.core.fast.FastItemStack
import com.willfp.eco.core.proxy.AbstractProxy
import org.bukkit.inventory.ItemStack
interface FastItemStackFactoryProxy : AbstractProxy {
fun create(itemStack: ItemStack): FastItemStack
}

11
eco-core/core-proxy/src/main/kotlin/proxy/SkullProxy.kt Normal file
View File

@@ -0,0 +1,11 @@
package proxy
import com.willfp.eco.core.proxy.AbstractProxy
import org.bukkit.inventory.meta.SkullMeta
interface SkullProxy : AbstractProxy {
fun setSkullTexture(
meta: SkullMeta,
base64: String
)
}

12
eco-core/core-proxy/src/main/kotlin/proxy/VillagerTradeProxy.kt Normal file
View File

@@ -0,0 +1,12 @@
package proxy
import com.willfp.eco.core.proxy.AbstractProxy
import org.bukkit.entity.Player
import org.bukkit.inventory.MerchantRecipe
interface VillagerTradeProxy : AbstractProxy {
fun displayTrade(
recipe: MerchantRecipe,
player: Player
): MerchantRecipe
}