API8 fixes #2609

Faithcaio · 2020-05-12T19:41:48Z

a bunch of fixes for the API8 implementation

Teleport code still needs a thorough check

gabizou · 2020-05-13T02:37:22Z

src/main/java/org/spongepowered/common/event/damage/SpongeEntityDamageSourceBuilder.java

@@ -49,8 +49,8 @@ public SpongeEntityDamageSourceBuilder entity(final Entity entity) {
    public EntityDamageSource build() throws IllegalStateException {
        checkState(this.damageType != null, "Damage type cannot be null!");
        checkState(this.reference.get() != null);
-        final net.minecraft.util.EntityDamageSource damageSource =
-            new net.minecraft.util.EntityDamageSource(this.damageType.getId(), (net.minecraft.entity.Entity) this.reference.get());
+        final net.minecraft.util.EntityDamageSource damageSource = // TODO damageType String is used for the translation key!


this is negotiated based on the mixin and damage source to type provider.

...cessors/java/org/spongepowered/common/accessor/entity/player/ServerPlayerEntityAccessor.java

gabizou

Turn on local variable can be final inspection and fix them. There's also some areas where it just looks really long or nested method calls that should be local variables (the compiler can take care of inlining).

src/main/java/org/spongepowered/common/bridge/block/DyeColorBlockBridge.java

src/main/java/org/spongepowered/common/data/provider/DataProviderRegistry.java

gabizou · 2020-05-14T05:44:41Z

src/main/java/org/spongepowered/common/entity/EntityUtil.java

-            if (fromClientDimId == toClientDimId) {
-                final int fakeDimId;
-                switch (fromClientDimId) {
+            if (fromType == toType) {


@Zidane is this right with dimension handling? I'd imagine the type could be the same but the dimension id assigned by the WorldManager could be different?

This is to send a fake respawn packet to vanilla clients in case the dimension type is not changing.
This entire teleport things needs extensive testing anyways once we can actually start a server.
Maybe its not needed anymore?

No you still have to fake sent a dimension change else you must send an unload packet for every chunk.

That is not including the other fun things the client sets based on the dimension.

I think this is still mentioned in the protocol wiki

src/main/java/org/spongepowered/common/entity/EntityUtil.java

src/main/java/org/spongepowered/common/event/tracking/phase/plugin/ListenerPhaseContext.java

other DataCompoundHolder impls are gone?

trying to fix explosion mixins (smoking parameter does not exist)

https://github.com/PaperMC/Paper/blob/master/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch and move it to the optimization module

@gabizou

@gabizou unsure about the ChunkManagerMixin_Tracker where the target is a lambda

Faithcaio added 9 commits May 12, 2020 18:37

fix SqlServiceImpl

727b149

fix incompatible types compile errors

5a275e0

fix SpongeTriggerBuilder missing from()

b72c3a1

Block DyeColors

cd1d9c0

fix most EntityUtil compile errors

0ab27d5

Teleport code still needs a thorough check

fix Tracker PhaseStates

b8e281c

fix PacketPhaseUtil main hand slot restoration

ab5ddcf

fix SpongeEntityDamageSourceBuilder

e1605c1

notifier is data

114ecf0

Faithcaio added the version: 1.16 (u) API: 8 label May 12, 2020

Faithcaio requested review from Deamon5550 and gabizou as code owners May 12, 2020 19:41

gabizou reviewed May 13, 2020

View reviewed changes

Faithcaio added 3 commits May 13, 2020 20:09

fix SmeltingRecipe mixin

87f12af

remove SpongeUser raw data

80c816e

a bunch of easy mixin fixes

6160b63

gabizou reviewed May 14, 2020

View reviewed changes

...cessors/java/org/spongepowered/common/accessor/entity/player/ServerPlayerEntityAccessor.java Show resolved Hide resolved

gabizou requested changes May 14, 2020

View reviewed changes

pr comments

22abade

Faithcaio force-pushed the api8/fixes branch from f3d592b to 22abade Compare May 14, 2020 15:21

Faithcaio added 10 commits May 14, 2020 17:37

fix furnace toContainer

693c009

fix jukebox mixin

02b58b6

fix sign TE mixin

a54af90

fix SoundEvent Mixin

f8236a0

move invalid Text mixins

020ab7a

fix dyecolor again

1253924

fix FallingBlock mixin

7203d7d

fix FarmlandBlock mixin

97120df

fix FireBlock mixin targets

ef04f9c

fix TNTBlock mixin

ad42162

Faithcaio added 11 commits May 14, 2020 18:57

fix SpongeUser mixin

e533bd7

other DataCompoundHolder impls are gone?

fix ProjectileDispenseBehavior mixin

e87fa11

fix ArmorStandEntity overwrite

44d3732

not invalid anymore

5d87e62

partial fix CreeperEntity mixin

3428635

fix FishingBobberEntity mixin

5449564

fix projectile mixins

809075c

trying to fix explosion mixins (smoking parameter does not exist)

was this a performance fix?

dfcddd9

fix SScoreboardObjectivePacket mixin

2ab55fe

mostly fix Scoreboard mixins

182abdb

fix BeaconTileEntity mixin

81a3af7

Faithcaio force-pushed the api8/fixes branch from 83f15d8 to 6a7baa6 Compare May 16, 2020 16:50

Faithcaio added 10 commits May 16, 2020 19:32

Update/Fix tileentity ticking optimization based on PaperMC patch:

2a14e52

https://github.com/PaperMC/Paper/blob/master/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch and move it to the optimization module

fix HopperTileEntity mixin

1093821

removed it

1454e4d

fix some Text mixins

80df9d4

fix id -> key usage

0e9ecb2

fix entity collision mixins

857aaff

fix WorkbenchContainerMixin

eaf1cbe

fix ItemFrameEntityMixin_Optimization_Map

0a8b9f1

fix FilledMapItem_Optimization_Map

11d9861

fix collision optimization mixinw

bf9e6d3

Faithcaio force-pushed the api8/fixes branch from 9a59a31 to bf9e6d3 Compare May 16, 2020 17:33

Faithcaio added 3 commits May 16, 2020 19:53

fix real time mixins

3cb8f1e

fix ServerPlayerEntityMixin_Tracker

5f3a029

fix tracker mixins

f8a4a77

@gabizou unsure about the ChunkManagerMixin_Tracker where the target is a lambda

Faithcaio force-pushed the api8/fixes branch from c0fffb1 to f8a4a77 Compare May 16, 2020 18:37

Faithcaio added the status: needs review a code review is needed label May 16, 2020

gabizou merged commit 9466952 into api-8 May 18, 2020

Faithcaio deleted the api8/fixes branch May 19, 2020 18:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

API8 fixes #2609

API8 fixes #2609

Faithcaio commented May 12, 2020

gabizou May 13, 2020

gabizou left a comment

gabizou May 14, 2020

Faithcaio May 14, 2020

Zidane May 14, 2020

i509VCB May 14, 2020

API8 fixes #2609

API8 fixes #2609

Conversation

Faithcaio commented May 12, 2020

gabizou May 13, 2020

Choose a reason for hiding this comment

gabizou left a comment

Choose a reason for hiding this comment

gabizou May 14, 2020

Choose a reason for hiding this comment

Faithcaio May 14, 2020

Choose a reason for hiding this comment

Zidane May 14, 2020

Choose a reason for hiding this comment

i509VCB May 14, 2020

Choose a reason for hiding this comment