mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Update to 1.17
Update to Official classnames Patchwork Make the game compile and run Merge in the new HUD overlay API Merge in the new render properties API PEEL Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason. New FML installer Update to 1.17.1 Co-authored-by: LexManos <[email protected]> Co-authored-by: SizableShrimp <[email protected]> Co-authored-by: cpw <[email protected]> Co-authored-by: Curle <[email protected]> Co-authored-by: Unnoen <[email protected]> Co-authored-by: covers1624 <[email protected]> Co-authored-by: DaemonUmbra <[email protected]> Co-authored-by: gigaherz <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
064ae6961b
commit
be5446b91c
1990 files changed
+35661
-37544
No files matched your search
@@ -19,9 +19,8 @@
|
||||
|
||||
package net.minecraftforge.event;
|
||||
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.inventory.container.RepairContainer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraftforge.eventbus.api.Cancelable;
|
||||
import net.minecraftforge.eventbus.api.Event;
|
||||
|
||||
@@ -45,16 +44,9 @@ public class AnvilUpdateEvent extends Event
|
||||
private ItemStack output;
|
||||
private int cost;
|
||||
private int materialCost;
|
||||
@Nullable // TODO: Remove 1.17 - Nullable only in the instance that a mod uses the deprecated ctor.
|
||||
private final PlayerEntity player;
|
||||
private final Player player;
|
||||
|
||||
@Deprecated //TODO: Remove 1.17 - Use Player-contextual constructor below.
|
||||
public AnvilUpdateEvent(ItemStack left, ItemStack right, String name, int cost)
|
||||
{
|
||||
this(left, right, name, cost, null);
|
||||
}
|
||||
|
||||
public AnvilUpdateEvent(ItemStack left, ItemStack right, String name, int cost, PlayerEntity player)
|
||||
public AnvilUpdateEvent(ItemStack left, ItemStack right, String name, int cost, Player player)
|
||||
{
|
||||
this.left = left;
|
||||
this.right = right;
|
||||
@@ -157,11 +149,9 @@ public class AnvilUpdateEvent extends Event
|
||||
}
|
||||
|
||||
/**
|
||||
* Nullable in the case someone is using the deprecated constructor.
|
||||
* @return The player using this anvil container.
|
||||
*/
|
||||
@Nullable // TODO: Remove 1.17
|
||||
public PlayerEntity getPlayer()
|
||||
public Player getPlayer()
|
||||
{
|
||||
return this.player;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user