Skip to content

Commit ff0ce6d

Browse files
datatagsdatatags
committed
Move support from 1_19_R1 to 1_19_R2
1 parent 4c8f1bf commit ff0ce6d

25 files changed

Lines changed: 79 additions & 83 deletions

‎core/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
// ideally matches the dependency version of the latest NMS module
7-
compileOnly 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
7+
compileOnly 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
88
compileOnly('LibsDisguises:LibsDisguises:10.0.31') {
99
exclude group: 'org.spigotmc'
1010
exclude group: 'com.comphenix.protocol'

‎core/src/main/java/be/isach/ultracosmetics/util/ServerVersion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public enum ServerVersion {
1717
v1_16("1.16.5", null, 0),
1818
v1_17("1.17.1", null, 0),
1919
v1_18("1.18.2", "eaeedbff51b16ead3170906872fda334", 2),
20-
v1_19("1.19.2", "69c84c88aeb92ce9fa9525438b93f4fe", 1);
20+
v1_19("1.19.3", "1afe2ffe8a9d7fc510442a168b3d4338", 2);
2121

2222
private final String name;
2323
// mappingsVersion is a random string that is changed whenever NMS changes
2424
// which is more often than actual NMS revisions happen. You can find this
2525
// value by checking the source code of this method:
2626
// org.bukkit.craftbukkit.util.CraftMagicNumbers#getMappingsVersion
27-
// https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java#240
27+
// https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/browse/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java#238
2828
// getMappingsVersion was added in 1.13.2, earlier versions don't have it.
2929
private final String mappingsVersion;
3030
// The NMS revision the corresponding module is built for, or 0 for no module.

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
include 'v1_18_R2', 'v1_19_R1', 'core', 'worldguard', 'worldguard-legacy'
1+
include 'v1_18_R2', 'v1_19_R2', 'core', 'worldguard', 'worldguard-legacy'
22
rootProject.name = 'UltraCosmetics'

‎v1_19_R1/gradle.properties‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

v1_19_R1/build.gradle renamed to v1_19_R2/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
dependencies {
2-
implementation 'org.spigotmc:spigot:1.19.2-R0.1-SNAPSHOT:remapped-mojang'
2+
implementation 'org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:remapped-mojang'
33
implementation project(':core')
44
}

‎v1_19_R2/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
javaVersion = 17
2+
remapMcVersion = 1.19.3

v1_19_R1/src/main/java/be/isach/ultracosmetics/v1_19_R1/EntityBase.java renamed to v1_19_R2/src/main/java/be/isach/ultracosmetics/v1_19_R2/EntityBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.v1_19_R1;
1+
package be.isach.ultracosmetics.v1_19_R2;
22

33
/**
44
* @author RadBuilder

v1_19_R1/src/main/java/be/isach/ultracosmetics/v1_19_R1/EntityUtil.java renamed to v1_19_R2/src/main/java/be/isach/ultracosmetics/v1_19_R2/EntityUtil.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.v1_19_R1;
1+
package be.isach.ultracosmetics.v1_19_R2;
22

33
import be.isach.ultracosmetics.UltraCosmeticsData;
44
import be.isach.ultracosmetics.util.MathUtils;
@@ -7,11 +7,11 @@
77

88
import org.bukkit.Bukkit;
99
import org.bukkit.Location;
10-
import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
11-
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftEntity;
12-
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
13-
import org.bukkit.craftbukkit.v1_19_R1.entity.CraftWither;
14-
import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
10+
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
11+
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftEntity;
12+
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
13+
import org.bukkit.craftbukkit.v1_19_R2.entity.CraftWither;
14+
import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
1515
import org.bukkit.entity.Player;
1616
import org.bukkit.entity.Wither;
1717
import org.bukkit.util.Vector;
@@ -69,7 +69,7 @@ public void sendBlizzard(final Player player, Location loc, Predicate<org.bukkit
6969
loc.getZ() + MathUtils.randomDouble(-1.5, 1.5), 0, 0);
7070
fakeArmorStands.add(as);
7171
ClientboundAddEntityPacket addPacket = new ClientboundAddEntityPacket(as);
72-
ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(as.getId(), as.getEntityData(), false);
72+
ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(as.getId(), as.getEntityData().packDirty());
7373
List<Pair<EquipmentSlot,ItemStack>> equipment = new ArrayList<>();
7474
equipment.add(new Pair<>(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(new org.bukkit.inventory.ItemStack(org.bukkit.Material.PACKED_ICE))));
7575
ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(as.getId(), equipment);

v1_19_R1/src/main/java/be/isach/ultracosmetics/v1_19_R1/ObfuscatedFields.java renamed to v1_19_R2/src/main/java/be/isach/ultracosmetics/v1_19_R2/ObfuscatedFields.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package be.isach.ultracosmetics.v1_19_R1;
1+
package be.isach.ultracosmetics.v1_19_R2;
22

33
public class ObfuscatedFields {
44
// corresponds to net.minecraft.world.entity.LivingEntity#jumping

v1_19_R1/src/main/java/be/isach/ultracosmetics/v1_19_R1/VersionModule.java renamed to v1_19_R2/src/main/java/be/isach/ultracosmetics/v1_19_R2/VersionModule.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
package be.isach.ultracosmetics.v1_19_R1;
1+
package be.isach.ultracosmetics.v1_19_R2;
22

33
import be.isach.ultracosmetics.UltraCosmeticsData;
44
import be.isach.ultracosmetics.cosmetics.morphs.Morph;
55
import be.isach.ultracosmetics.cosmetics.mounts.Mount;
66
import be.isach.ultracosmetics.cosmetics.pets.Pet;
77
import be.isach.ultracosmetics.util.SmartLogger;
88
import be.isach.ultracosmetics.util.SmartLogger.LogLevel;
9-
import be.isach.ultracosmetics.v1_19_R1.customentities.CustomEntities;
10-
import be.isach.ultracosmetics.v1_19_R1.customentities.CustomEntityFirework;
11-
import be.isach.ultracosmetics.v1_19_R1.morphs.MorphElderGuardian;
12-
import be.isach.ultracosmetics.v1_19_R1.mount.MountSlime;
13-
import be.isach.ultracosmetics.v1_19_R1.mount.MountSpider;
14-
import be.isach.ultracosmetics.v1_19_R1.pets.PetPumpling;
9+
import be.isach.ultracosmetics.v1_19_R2.customentities.CustomEntities;
10+
import be.isach.ultracosmetics.v1_19_R2.customentities.CustomEntityFirework;
11+
import be.isach.ultracosmetics.v1_19_R2.morphs.MorphElderGuardian;
12+
import be.isach.ultracosmetics.v1_19_R2.mount.MountSlime;
13+
import be.isach.ultracosmetics.v1_19_R2.mount.MountSpider;
14+
import be.isach.ultracosmetics.v1_19_R2.pets.PetPumpling;
1515
import be.isach.ultracosmetics.version.IModule;
1616

1717
import org.bukkit.Bukkit;
1818
import org.bukkit.FireworkEffect;
1919
import org.bukkit.Location;
20-
import org.bukkit.craftbukkit.v1_19_R1.CraftWorld;
20+
import org.bukkit.craftbukkit.v1_19_R2.CraftWorld;
2121
import org.bukkit.entity.Firework;
2222
import org.bukkit.entity.Player;
2323
import org.bukkit.inventory.meta.FireworkMeta;

0 commit comments

Comments
 (0)