Skip to content

Commit bd675c3

Browse files
datatagsdatatags
committed
Delete v1_18_R2, add v1_20_R1 module
1 parent 33349e7 commit bd675c3

26 files changed

Lines changed: 246 additions & 244 deletions

‎.github/workflows/gradle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
with:
2222
distribution: temurin
2323
java-version: 17
24-
- name: Build MC 1.18.2
25-
run: java -jar BuildTools.jar --rev 1.18.2 --remapped
2624
- name: Build MC 1.19.4
2725
run: java -jar BuildTools.jar --rev 1.19.4 --remapped
26+
- name: Build MC 1.20
27+
run: java -jar BuildTools.jar --rev 1.20 --remapped
2828
- name: Build with Gradle
2929
run: ./gradlew obfuscate --no-daemon
3030
- uses: actions/upload-artifact@v3.1.1 #https://github.com/actions/upload-artifact/releases

‎core/build.gradle‎

Lines changed: 3 additions & 3 deletions
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.4-R0.1-SNAPSHOT'
7+
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
88
compileOnly('LibsDisguises:LibsDisguises:10.0.31') {
99
exclude group: 'org.spigotmc'
1010
exclude group: 'com.comphenix.protocol'
@@ -23,14 +23,14 @@ dependencies {
2323
// NMS modules can't actually use XSeries but it doesn't compile without 'api'.
2424
// IDEs do not like it when 'core' references XSeries directly
2525
// but subprojects must reference XSeries as shaded.
26-
api 'com.github.cryptomorin:XSeries:9.3.1'
26+
api 'com.github.cryptomorin:XSeries:9.4.0'
2727
implementation 'org.bstats:bstats-bukkit:3.0.0'
2828
compileOnly 'net.luckperms:api:5.4'
2929
compileOnly "me.lokka30:treasury-api:1.2.1-SNAPSHOT"
3030
compileOnly 'de.jeff_media:ChestSortAPI:13.0.0-SNAPSHOT'
3131
compileOnly 'com.palmergames.bukkit.towny:towny:0.98.6.0'
3232
implementation 'com.zaxxer:HikariCP:4.0.3'
33-
implementation 'net.wesjd:anvilgui:1.6.3-SNAPSHOT'
33+
implementation 'net.wesjd:anvilgui:1.6.6-SNAPSHOT'
3434
implementation 'me.gamercoder215:mobchip-bukkit:1.8.1-SNAPSHOT'
3535
compileOnly 'com.discordsrv:discordsrv:1.26.0'
3636
compileOnly 'me.soknight:peconomy:2.7.3'

‎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_R3', 'core', 'worldguard', 'worldguard-legacy'
1+
include 'v1_19_R3', 'v1_20_R1', 'core', 'worldguard', 'worldguard-legacy'
22
rootProject.name = 'UltraCosmetics'

‎v1_18_R2/build.gradle‎

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

‎v1_18_R2/gradle.properties‎

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

‎v1_20_R1/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
dependencies {
2+
implementation 'org.spigotmc:spigot:1.20-R0.1-SNAPSHOT:remapped-mojang'
3+
implementation project(':core')
4+
}

‎v1_20_R1/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.20

v1_18_R2/src/main/java/be/isach/ultracosmetics/v1_18_R2/EntityBase.java renamed to v1_20_R1/src/main/java/be/isach/ultracosmetics/v1_20_R1/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_18_R2;
1+
package be.isach.ultracosmetics.v1_20_R1;
22

33
/**
44
* @author RadBuilder

v1_18_R2/src/main/java/be/isach/ultracosmetics/v1_18_R2/EntityUtil.java renamed to v1_20_R1/src/main/java/be/isach/ultracosmetics/v1_20_R1/EntityUtil.java

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
package be.isach.ultracosmetics.v1_18_R2;
1+
package be.isach.ultracosmetics.v1_20_R1;
22

33
import be.isach.ultracosmetics.UltraCosmeticsData;
44
import be.isach.ultracosmetics.util.MathUtils;
55
import be.isach.ultracosmetics.util.Particles;
66
import be.isach.ultracosmetics.version.IEntityUtil;
7-
7+
import com.mojang.datafixers.util.Pair;
8+
import net.minecraft.core.Rotations;
9+
import net.minecraft.network.protocol.Packet;
10+
import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
11+
import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
12+
import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
13+
import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
14+
import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
15+
import net.minecraft.world.entity.EntityType;
16+
import net.minecraft.world.entity.EquipmentSlot;
17+
import net.minecraft.world.entity.decoration.ArmorStand;
18+
import net.minecraft.world.item.ItemStack;
819
import org.bukkit.Bukkit;
920
import org.bukkit.Location;
10-
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
11-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
12-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
13-
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftWither;
14-
import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
21+
import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
22+
import org.bukkit.craftbukkit.v1_19_R3.entity.CraftEntity;
23+
import org.bukkit.craftbukkit.v1_19_R3.entity.CraftPlayer;
24+
import org.bukkit.craftbukkit.v1_19_R3.entity.CraftWither;
25+
import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftItemStack;
1526
import org.bukkit.entity.Player;
1627
import org.bukkit.entity.Wither;
1728
import org.bukkit.util.Vector;
1829

19-
import com.mojang.datafixers.util.Pair;
20-
2130
import java.util.ArrayList;
2231
import java.util.HashMap;
2332
import java.util.HashSet;
@@ -27,27 +36,15 @@
2736
import java.util.Set;
2837
import java.util.function.Predicate;
2938

30-
import net.minecraft.core.Rotations;
31-
import net.minecraft.network.protocol.Packet;
32-
import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
33-
import net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
34-
import net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
35-
import net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
36-
import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
37-
import net.minecraft.world.entity.EntityType;
38-
import net.minecraft.world.entity.EquipmentSlot;
39-
import net.minecraft.world.entity.decoration.ArmorStand;
40-
import net.minecraft.world.item.ItemStack;
41-
4239
/**
4340
* @author RadBuilder
4441
* @author iSach
4542
*/
4643
public class EntityUtil implements IEntityUtil {
4744

4845
private final Random r = new Random();
49-
private Map<Player,Set<ArmorStand>> fakeArmorStandsMap = new HashMap<>();
50-
private Map<Player,Set<org.bukkit.entity.Entity>> cooldownJumpMap = new HashMap<>();
46+
private Map<Player, Set<ArmorStand>> fakeArmorStandsMap = new HashMap<>();
47+
private Map<Player, Set<org.bukkit.entity.Entity>> cooldownJumpMap = new HashMap<>();
5148

5249
@Override
5350
public void resetWitherSize(Wither wither) {
@@ -65,13 +62,13 @@ public void sendBlizzard(final Player player, Location loc, Predicate<org.bukkit
6562
as.setSmall(true);
6663
as.setNoGravity(true);
6764
as.setShowArms(true);
68-
as.setHeadPose(new Rotations((r.nextInt(360)), (r.nextInt(360)), (r.nextInt(360))));
69-
as.absMoveTo(loc.getX() + MathUtils.randomDouble(-1.5, 1.5), loc.getY() + MathUtils.randomDouble(0, .05) - 0.75,
65+
as.setHeadPose(new Rotations(r.nextInt(360), r.nextInt(360), r.nextInt(360)));
66+
as.absMoveTo(loc.getX() + MathUtils.randomDouble(-1.5, 1.5), loc.getY() + MathUtils.randomDouble(0, 0.5) - 0.75,
7067
loc.getZ() + MathUtils.randomDouble(-1.5, 1.5), 0, 0);
7168
fakeArmorStands.add(as);
7269
ClientboundAddEntityPacket addPacket = new ClientboundAddEntityPacket(as);
73-
ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(as.getId(), as.getEntityData(), false);
74-
List<Pair<EquipmentSlot,ItemStack>> equipment = new ArrayList<>();
70+
ClientboundSetEntityDataPacket dataPacket = new ClientboundSetEntityDataPacket(as.getId(), as.getEntityData().packDirty());
71+
List<Pair<EquipmentSlot, ItemStack>> equipment = new ArrayList<>();
7572
equipment.add(new Pair<>(EquipmentSlot.HEAD, CraftItemStack.asNMSCopy(new org.bukkit.inventory.ItemStack(org.bukkit.Material.PACKED_ICE))));
7673
ClientboundSetEquipmentPacket equipmentPacket = new ClientboundSetEquipmentPacket(as.getId(), equipment);
7774
for (Player loopPlayer : player.getWorld().getPlayers()) {
@@ -121,7 +118,7 @@ public void sendDestroyPacket(Player player, org.bukkit.entity.Entity entity) {
121118

122119
@Override
123120
public void setStepHeight(org.bukkit.entity.Entity entity) {
124-
((CraftEntity) entity).getHandle().maxUpStep = 1;
121+
((CraftEntity) entity).getHandle().setMaxUpStep(1);
125122
}
126123

127124
@Override

v1_18_R2/src/main/java/be/isach/ultracosmetics/v1_18_R2/ObfuscatedFields.java renamed to v1_20_R1/src/main/java/be/isach/ultracosmetics/v1_20_R1/ObfuscatedFields.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
package be.isach.ultracosmetics.v1_18_R2;
1+
package be.isach.ultracosmetics.v1_20_R1;
22

3+
/**
4+
* This file automatically generated by obfuscatedfields_generator.py in tooling folder
5+
*/
36
public class ObfuscatedFields {
47
// corresponds to net.minecraft.world.entity.LivingEntity#jumping
5-
public static final String JUMPING = "bn";
8+
public static final String JUMPING = "bi";
69
// corresponds to net.minecraft.world.entity.ai.navigation.PathNavigation#isInLiquid()
710
public static final String IS_IN_LIQUID = "o";
811
// corresponds to net.minecraft.world.entity.ai.Brain#memories
@@ -14,9 +17,10 @@ public class ObfuscatedFields {
1417
// corresponds to net.minecraft.world.entity.ai.goal.GoalSelector#disabledFlags
1518
public static final String DISABLED_FLAGS = "f";
1619
// corresponds to net.minecraft.core.MappedRegistry#frozen
17-
public static final String FROZEN = "bL";
18-
// corresponds to net.minecraft.core.MappedRegistry#intrusiveHolderCache
19-
public static final String INTRUSIVE_HOLDER_CACHE = "bN";
20+
public static final String FROZEN = "l";
21+
// corresponds to net.minecraft.core.MappedRegistry#unregisteredIntrusiveHolders
22+
public static final String INTRUSIVE_HOLDER_CACHE = "m";
2023

21-
private ObfuscatedFields() {}
24+
private ObfuscatedFields() {
25+
}
2226
}

0 commit comments

Comments
 (0)