-
Notifications
You must be signed in to change notification settings - Fork 422
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Entity Lifespan API #3713
Closed
Closed
Entity Lifespan API #3713
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
3db3aa6
entity lifespan api
Spinoscythe c358151
Merge branch '1.20.5' into entity-lifespan-api
Spinoscythe 54f8002
changes
Spinoscythe bcbc5fb
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe 4065c18
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe b2a06af
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe 6ff94c9
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe d0e0f55
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe e35b735
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe abdb667
Update fabric-item-api-v1/src/main/java/net/fabricmc/fabric/api/item/…
Spinoscythe ed8bd03
changes 2
Spinoscythe bd46f3a
Always get the latest ServerPlayerEntity from ServerPlayNetworkHandle…
modmuss50 bbb1ae0
Bump version
modmuss50 db2ee42
Fix crash when generating flat world (#3741)
apple502j adfab80
Bump version
modmuss50 35237ee
Merge branch '1.20.5' into entity-lifespan-api
Spinoscythe 42d07c8
Merge branch '1.20.6' into entity-lifespan-api
Spinoscythe ad4c31f
Merge branch '1.20.6' into entity-lifespan-api
Spinoscythe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemEntityAccessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.fabricmc.fabric.mixin.item; | ||
|
||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.gen.Accessor; | ||
|
||
import net.minecraft.entity.ItemEntity; | ||
|
||
@Mixin(ItemEntity.class) | ||
public interface ItemEntityAccessor { | ||
@Accessor("DESPAWN_AGE") | ||
static int getDespawnAge() { | ||
throw new AssertionError(); | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/ItemEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.fabricmc.fabric.mixin.item; | ||
|
||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
import net.minecraft.entity.Entity; | ||
import net.minecraft.entity.EntityType; | ||
import net.minecraft.entity.ItemEntity; | ||
import net.minecraft.item.ItemStack; | ||
import net.minecraft.world.World; | ||
|
||
@Mixin(ItemEntity.class) | ||
public abstract class ItemEntityMixin extends Entity { | ||
|
||
@Shadow | ||
private int itemAge; | ||
|
||
private ItemEntityMixin(EntityType<?> type, World world) { | ||
super(type, world); | ||
} | ||
|
||
@Inject(at = @At("TAIL"), method = "setDespawnImmediately") | ||
private void modifyDespawnImmediately(CallbackInfo ci) { | ||
this.itemAge = getStack().getEntityLifespan((ItemEntity) ((Entity) this), this.getWorld()); | ||
} | ||
|
||
@Shadow | ||
abstract ItemStack getStack(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert those changes