Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Commit

Permalink
Update to 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
@Patbox
Patbox committed Jun 5, 2022
1 parent 9f44b41 commit 5f1d609
Show file tree
Hide file tree
Showing 34 changed files with 197 additions and 339 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ko_fi: Patbox
40 changes: 20 additions & 20 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'fabric-loom' version '0.12-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -10,10 +10,6 @@ archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

minecraft {
accessWidener = file("src/main/resources/hologramapi.accesswidener")
}

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
Expand All @@ -31,6 +27,24 @@ sourceSets {
}
}


dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API. This is technically optional, but you probably want it anyway.
modLocalRuntime "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompileOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

//modRuntime "com.github.SuperCoder7979:databreaker:0.2.6"

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
testmodImplementation sourceSets.main.output
}

loom {
runs {
testmodClient {
Expand All @@ -46,22 +60,8 @@ loom {
source sourceSets.testmod
}
}
}

dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

//modRuntime "com.github.SuperCoder7979:databreaker:0.2.6"

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
testmodImplementation sourceSets.main.output
accessWidenerPath = file("src/main/resources/hologramapi.accesswidener")
}

processResources {
Expand Down
13 changes: 7 additions & 6 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.18-pre5
yarn_mappings=1.18-pre5+build.2
loader_version=0.12.5
minecraft_version=1.19-rc2
yarn_mappings=1.19-rc2+build.1
loader_version=0.14.6

#Fabric api
fabric_version=0.55.0+1.19

#Fabric api
fabric_version=0.42.8+1.18

# Mod Properties
mod_version = 0.2.1+1.18-pre5
mod_version = 0.2.2+1.19
maven_group = eu.pb4
archives_base_name = hologram-api

Expand Down
28 changes: 7 additions & 21 deletions src/main/java/eu/pb4/holograms/api/elements/clickable/CubeHitboxHologramElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
import eu.pb4.holograms.api.elements.AbstractHologramElement;
import eu.pb4.holograms.api.holograms.AbstractHologram;
import eu.pb4.holograms.mixin.accessors.*;
import eu.pb4.holograms.utils.HologramHelper;
import eu.pb4.holograms.utils.PacketHelpers;
import eu.pb4.holograms.impl.HologramHelper;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.MobSpawnS2CPacket;
import net.minecraft.network.packet.s2c.play.TeamS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.registry.Registry;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -37,23 +35,11 @@ public CubeHitboxHologramElement(int size, Vec3d offset) {
public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

{
MobSpawnS2CPacket packet = PacketHelpers.createMobSpawn();
MobSpawnS2CPacketAccessor accessor = (MobSpawnS2CPacketAccessor) packet;
accessor.setId(this.entityId);
accessor.setPitch((byte) 0);
accessor.setYaw((byte) 0);
accessor.setHeadYaw((byte) 0);
accessor.setX(pos.x);
accessor.setY(pos.y);
accessor.setZ(pos.z);
accessor.setEntityType(Registry.ENTITY_TYPE.getRawId(EntityType.SLIME));
accessor.setUUID(uuid);

player.networkHandler.sendPacket(packet);
}
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.entityId, this.uuid, pos.x, pos.y, pos.z, 0, 0, EntityType.SLIME, 0, Vec3d.ZERO, 0));

{
EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacket packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.entityId);
Expand All @@ -79,8 +65,8 @@ public void createRemovePackets(ServerPlayerEntity player, AbstractHologram holo
public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

EntityPositionS2CPacket packet = PacketHelpers.createEntityPosition();
EntityPositionS2CPacketAccessor accessor = (EntityPositionS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityPositionS2CPacket.class);
var accessor = (EntityPositionS2CPacketAccessor) packet;
accessor.setId(this.entityId);
accessor.setX(pos.x);
accessor.setY(pos.y);
Expand Down
27 changes: 7 additions & 20 deletions src/main/java/eu/pb4/holograms/api/elements/clickable/EntityHitboxHologramElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
import eu.pb4.holograms.api.elements.AbstractHologramElement;
import eu.pb4.holograms.api.holograms.AbstractHologram;
import eu.pb4.holograms.mixin.accessors.*;
import eu.pb4.holograms.utils.HologramHelper;
import eu.pb4.holograms.utils.PacketHelpers;
import eu.pb4.holograms.impl.HologramHelper;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.MobSpawnS2CPacket;
import net.minecraft.network.packet.s2c.play.TeamS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.Vec3d;
Expand Down Expand Up @@ -38,23 +37,11 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

{
MobSpawnS2CPacket packet = PacketHelpers.createMobSpawn();
MobSpawnS2CPacketAccessor accessor = (MobSpawnS2CPacketAccessor) packet;
accessor.setId(this.entityId);
accessor.setPitch((byte) 0);
accessor.setYaw((byte) 0);
accessor.setHeadYaw((byte) 0);
accessor.setX(pos.x);
accessor.setY(pos.y);
accessor.setZ(pos.z);
accessor.setEntityType(Registry.ENTITY_TYPE.getRawId(this.entityType));
accessor.setUUID(uuid);

player.networkHandler.sendPacket(packet);
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.entityId, this.uuid, pos.x, pos.y, pos.z, 0, 0, this.entityType, 0, Vec3d.ZERO, 0));
}
{
EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
var accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.entityId);
List<DataTracker.Entry<?>> data = new ArrayList<>();
Expand All @@ -79,8 +66,8 @@ public void createRemovePackets(ServerPlayerEntity player, AbstractHologram holo
public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

EntityPositionS2CPacket packet = PacketHelpers.createEntityPosition();
EntityPositionS2CPacketAccessor accessor = (EntityPositionS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityPositionS2CPacket.class);
var accessor = (EntityPositionS2CPacketAccessor) packet;
accessor.setId(this.entityId);
accessor.setX(pos.x);
accessor.setY(pos.y);
Expand Down
10 changes: 3 additions & 7 deletions src/main/java/eu/pb4/holograms/api/elements/clickable/EntityHologramElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,17 @@
import eu.pb4.holograms.api.elements.AbstractHologramElement;
import eu.pb4.holograms.api.holograms.AbstractHologram;
import eu.pb4.holograms.mixin.accessors.EntityAccessor;
import eu.pb4.holograms.mixin.accessors.EntityPositionS2CPacketAccessor;
import eu.pb4.holograms.mixin.accessors.EntityTrackerUpdateS2CPacketAccessor;
import eu.pb4.holograms.utils.HologramHelper;
import eu.pb4.holograms.utils.PacketHelpers;
import eu.pb4.holograms.impl.HologramHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.TeamS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.Vec3d;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class EntityHologramElement extends AbstractHologramElement {
protected final Entity entity;
Expand All @@ -40,8 +36,8 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog

player.networkHandler.sendPacket(this.entity.createSpawnPacket());

EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
var accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.entity.getId());
List<DataTracker.Entry<?>> data = new ArrayList<>();
Expand Down
24 changes: 11 additions & 13 deletions src/main/java/eu/pb4/holograms/api/elements/item/SpinningItemHologramElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import eu.pb4.holograms.api.holograms.AbstractHologram;
import eu.pb4.holograms.mixin.accessors.*;
import eu.pb4.holograms.utils.HologramHelper;
import eu.pb4.holograms.utils.PacketHelpers;
import eu.pb4.holograms.impl.HologramHelper;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.item.ItemStack;
Expand All @@ -16,7 +15,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;

public class SpinningItemHologramElement extends AbstractItemHologramElement {
Expand Down Expand Up @@ -46,10 +44,10 @@ public SpinningItemHologramElement(ItemStack stack) {
public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);
{
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.itemId, this.itemUuid, pos.x, pos.y, pos.z, 0, 0, EntityType.ITEM, 0, Vec3d.ZERO));
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.itemId, this.itemUuid, pos.x, pos.y, pos.z, 0, 0, EntityType.ITEM, 0, Vec3d.ZERO, 0));

EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
var accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.itemId);
List<DataTracker.Entry<?>> data = new ArrayList<>();
Expand All @@ -61,9 +59,9 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog
}

{
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.helperId, this.helperUuid, pos.x, pos.y - 0.6, pos.z, 0, 0, EntityType.AREA_EFFECT_CLOUD, 0, Vec3d.ZERO));
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.helperId, this.helperUuid, pos.x, pos.y - 0.6, pos.z, 0, 0, EntityType.AREA_EFFECT_CLOUD, 0, Vec3d.ZERO, 0));

EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
var packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.helperId);
Expand All @@ -75,8 +73,8 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog
}

{
EntityPassengersSetS2CPacket packet = PacketHelpers.createEntityPassengersSet();
EntityPassengersSetS2CPacketAccessor accessor = (EntityPassengersSetS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityPassengersSetS2CPacket.class);
var accessor = (EntityPassengersSetS2CPacketAccessor) packet;
accessor.setId(helperId);
accessor.setPassengers(new int[]{itemId});

Expand All @@ -88,7 +86,7 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog
public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

EntityPositionS2CPacket packet = PacketHelpers.createEntityPosition();
var packet = HologramHelper.createUnsafe(EntityPositionS2CPacket.class);
EntityPositionS2CPacketAccessor accessor = (EntityPositionS2CPacketAccessor) packet;
accessor.setId(this.helperId);
accessor.setX(pos.x);
Expand All @@ -103,8 +101,8 @@ public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram)
@Override
public void onTick(AbstractHologram hologram) {
if (this.isDirty) {
EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
var accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.itemId);
List<DataTracker.Entry<?>> data = new ArrayList<>();
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/eu/pb4/holograms/api/elements/item/StaticItemHologramElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

import eu.pb4.holograms.api.holograms.AbstractHologram;
import eu.pb4.holograms.mixin.accessors.*;
import eu.pb4.holograms.utils.HologramHelper;
import eu.pb4.holograms.utils.PacketHelpers;
import eu.pb4.holograms.impl.HologramHelper;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.item.ItemStack;
Expand Down Expand Up @@ -37,9 +36,9 @@ public StaticItemHologramElement(ItemStack stack) {
public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.entityId, this.uuid, pos.x, pos.y, pos.z, 0, 0, EntityType.SNOWBALL, 0, Vec3d.ZERO));
player.networkHandler.sendPacket(new EntitySpawnS2CPacket(this.entityId, this.uuid, pos.x, pos.y, pos.z, 0, 0, EntityType.SNOWBALL, 0, Vec3d.ZERO, 0));

EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacket packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.entityId);
Expand All @@ -56,8 +55,8 @@ public void createSpawnPackets(ServerPlayerEntity player, AbstractHologram holog
public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram) {
Vec3d pos = hologram.getElementPosition(this).add(this.offset);

EntityPositionS2CPacket packet = PacketHelpers.createEntityPosition();
EntityPositionS2CPacketAccessor accessor = (EntityPositionS2CPacketAccessor) packet;
var packet = HologramHelper.createUnsafe(EntityPositionS2CPacket.class);
var accessor = (EntityPositionS2CPacketAccessor) packet;
accessor.setId(this.entityId);
accessor.setX(pos.x);
accessor.setY(pos.y);
Expand All @@ -71,7 +70,7 @@ public void updatePosition(ServerPlayerEntity player, AbstractHologram hologram)
@Override
public void onTick(AbstractHologram hologram) {
if (this.isDirty) {
EntityTrackerUpdateS2CPacket packet = PacketHelpers.createEntityTrackerUpdate();
EntityTrackerUpdateS2CPacket packet = HologramHelper.createUnsafe(EntityTrackerUpdateS2CPacket.class);
EntityTrackerUpdateS2CPacketAccessor accessor = (EntityTrackerUpdateS2CPacketAccessor) packet;

accessor.setId(this.entityId);
Expand Down
Loading

0 comments on commit 5f1d609

Please sign in to comment.