Skip to content

Commit d593c4b

Browse files
author
games647
committedMar 28, 2018
Update example to 1.12
1 parent eb4bae7 commit d593c4b

File tree

6 files changed

+25
-27
lines changed

6 files changed

+25
-27
lines changed
 

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'base'
55

66
subprojects {
77
apply plugin: 'java'
8-
sourceCompatibility = 1.8
8+
sourceCompatibility = JavaVersion.VERSION_1_8
99

1010
repositories {
1111
mavenCentral()

‎example-plugin/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
compileOnly "org.spigotmc:spigot:1.11.2-R0.1-SNAPSHOT"
2+
compileOnly "org.spigotmc:spigot:1.12.2-R0.1-SNAPSHOT"
33
compile project(":api")
44
compileOnly project(":agent")
55
}

‎example-plugin/src/main/java/me/yamakaja/runtimetransformer/plugin/ExampleTransformationPlugin.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import me.yamakaja.runtimetransformer.plugin.transformer.CraftServerTransformer;
55
import me.yamakaja.runtimetransformer.plugin.transformer.EntityLivingTransformer;
66
import me.yamakaja.runtimetransformer.plugin.transformer.SkullMetaTransformer;
7-
import org.bukkit.Bukkit;
7+
88
import org.bukkit.command.Command;
99
import org.bukkit.command.CommandSender;
1010
import org.bukkit.entity.Player;
1111
import org.bukkit.inventory.ItemStack;
12-
import org.bukkit.inventory.meta.ItemMeta;
1312
import org.bukkit.inventory.meta.SkullMeta;
1413
import org.bukkit.plugin.java.JavaPlugin;
1514

‎example-plugin/src/main/java/me/yamakaja/runtimetransformer/plugin/transformer/CraftServerTransformer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import me.yamakaja.runtimetransformer.annotation.Inject;
44
import me.yamakaja.runtimetransformer.annotation.InjectionType;
55
import me.yamakaja.runtimetransformer.annotation.Transform;
6-
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
6+
7+
import org.bukkit.craftbukkit.v1_12_R1.CraftServer;
78

89
/**
910
* Created by Yamakaja on 20.05.17.

‎example-plugin/src/main/java/me/yamakaja/runtimetransformer/plugin/transformer/EntityLivingTransformer.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import me.yamakaja.runtimetransformer.annotation.Inject;
44
import me.yamakaja.runtimetransformer.annotation.InjectionType;
55
import me.yamakaja.runtimetransformer.annotation.Transform;
6-
import net.minecraft.server.v1_11_R1.DamageSource;
7-
import net.minecraft.server.v1_11_R1.EntityLiving;
8-
import net.minecraft.server.v1_11_R1.World;
6+
7+
import net.minecraft.server.v1_12_R1.DamageSource;
8+
import net.minecraft.server.v1_12_R1.EntityLiving;
9+
import net.minecraft.server.v1_12_R1.World;
10+
911
import org.bukkit.Bukkit;
1012

1113
/**
@@ -26,7 +28,7 @@ public void _init_(World world) {
2628

2729
// Injecting into a private method
2830
@Inject(InjectionType.INSERT)
29-
private boolean d(DamageSource src) {
31+
private boolean e(DamageSource src) {
3032
Bukkit.broadcastMessage("Checked " + this.getName() + " for totem @ " + (int) this.locX + ", " + (int) this.locY + ", " + (int) this.locZ + "!");
3133
throw null; // Let original method continue execution
3234
}

‎example-plugin/src/main/java/me/yamakaja/runtimetransformer/plugin/transformer/SkullMetaTransformer.java

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
package me.yamakaja.runtimetransformer.plugin.transformer;
22

3-
import com.google.common.base.Predicate;
43
import com.mojang.authlib.GameProfile;
4+
55
import me.yamakaja.runtimetransformer.annotation.CallParameters;
66
import me.yamakaja.runtimetransformer.annotation.Inject;
77
import me.yamakaja.runtimetransformer.annotation.InjectionType;
88
import me.yamakaja.runtimetransformer.annotation.TransformByName;
9-
import net.minecraft.server.v1_11_R1.GameProfileSerializer;
10-
import net.minecraft.server.v1_11_R1.NBTTagCompound;
11-
import net.minecraft.server.v1_11_R1.TileEntitySkull;
129

13-
import javax.annotation.Nullable;
10+
import net.minecraft.server.v1_12_R1.GameProfileSerializer;
11+
import net.minecraft.server.v1_12_R1.NBTTagCompound;
12+
import net.minecraft.server.v1_12_R1.TileEntitySkull;
1413

1514
/**
1615
* Created by Yamakaja on 3/3/18.
1716
*/
18-
@TransformByName("org.bukkit.craftbukkit.v1_11_R1.inventory.CraftMetaSkull")
17+
@TransformByName("org.bukkit.craftbukkit.v1_12_R1.inventory.CraftMetaSkull")
1918
public class SkullMetaTransformer {
2019

2120
private GameProfile profile;
2221

2322
@CallParameters(
2423
type = CallParameters.Type.SPECIAL,
25-
owner = "org/bukkit/craftbukkit/v1_11_R1/inventory/CraftMetaItem",
24+
owner = "org/bukkit/craftbukkit/v1_12_R1/inventory/CraftMetaItem",
2625
name = "applyToItem",
27-
desc = "(Lnet/minecraft/server/v1_11_R1/NBTTagCompound;)V"
26+
desc = "(Lnet/minecraft/server/v1_12_R1/NBTTagCompound;)V"
2827
)
2928
private native void super_applyToItem(NBTTagCompound tag);
3029

@@ -36,16 +35,13 @@ void applyToItem(final NBTTagCompound tag) {
3635
GameProfileSerializer.serialize(owner, this.profile);
3736
tag.set("SkullOwner", owner);
3837
System.out.println("Set owner to " + owner);
39-
TileEntitySkull.b(this.profile, new Predicate<GameProfile>() {
40-
@Override
41-
public boolean apply(@Nullable GameProfile gameProfile) {
42-
NBTTagCompound newOwner = new NBTTagCompound();
43-
GameProfileSerializer.serialize(newOwner, gameProfile);
44-
tag.set("SkullOwner", newOwner);
45-
System.out.println("Received game profile!");
46-
return false;
47-
}
48-
});
38+
TileEntitySkull.b(this.profile, gameProfile -> {
39+
NBTTagCompound newOwner = new NBTTagCompound();
40+
GameProfileSerializer.serialize(newOwner, gameProfile);
41+
tag.set("SkullOwner", newOwner);
42+
System.out.println("Received game profile!");
43+
return false;
44+
}, true);
4945
}
5046

5147
}

0 commit comments

Comments
 (0)
Please sign in to comment.