Bump BootStrapLauncher, and make sure Capability providers call parent revive.

This commit is contained in:
LexManos committed 2021-08-10 00:11:20 -07:00
1 parent 4721d4c461
commit fcc819584a
6 files changed
+11 -6

No files matched your search

+1 -1
View File
@@ -52,7 +52,7 @@ ext {
EVENTBUS_VERSION = '5.0.3'
MODLAUNCHER_VERSION = '9.0.7'
SECUREJARHANDLER_VERSION = '0.9.46'
BOOTSTRAPLAUNCHER_VERSION = '0.1.16'
BOOTSTRAPLAUNCHER_VERSION = '0.1.17'
ASM_VERSION = '9.1'
INSTALLER_VERSION = '2.1.5'
@@ -505,7 +505,7 @@
}
public boolean m_5830_() {
@@ -3198,6 +_,63 @@
@@ -3198,6 +_,64 @@
public void m_21190_(InteractionHand p_21191_) {
this.m_21166_(p_21191_ == InteractionHand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND);
@@ -565,6 +565,7 @@
+
+ @Override
+ public void reviveCaps() {
+ super.reviveCaps();
+ handlers = net.minecraftforge.items.wrapper.EntityEquipmentInvWrapper.create(this);
}
@@ -18,7 +18,7 @@
if (p_38255_ != null) {
lootcontext$builder.m_78963_(p_38255_.m_36336_()).m_78972_(LootContextParams.f_81455_, p_38255_);
}
@@ -219,4 +_,25 @@
@@ -219,4 +_,26 @@
}
protected abstract AbstractContainerMenu m_7402_(int p_38222_, Inventory p_38223_);
@@ -41,6 +41,7 @@
+
+ @Override
+ public void reviveCaps() {
+ super.reviveCaps();
+ itemHandler = net.minecraftforge.common.util.LazyOptional.of(() -> new net.minecraftforge.items.wrapper.InvWrapper(this));
+ }
}
@@ -145,7 +145,7 @@
}
}
@@ -483,5 +_,33 @@
@@ -483,5 +_,34 @@
p_58342_.m_36491_(itemstack);
}
@@ -176,6 +176,7 @@
+
+ @Override
+ public void reviveCaps() {
+ super.reviveCaps();
+ this.handlers = net.minecraftforge.items.wrapper.SidedInvWrapper.create(this, Direction.UP, Direction.DOWN, Direction.NORTH);
}
}
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java
@@ -82,4 +_,26 @@
@@ -82,4 +_,27 @@
}
protected abstract AbstractContainerMenu m_6555_(int p_58627_, Inventory p_58628_);
@@ -24,6 +24,7 @@
+
+ @Override
+ public void reviveCaps() {
+ super.reviveCaps();
+ itemHandler = net.minecraftforge.common.util.LazyOptional.of(() -> createUnSidedHandler());
+ }
}
@@ -51,7 +51,7 @@
}
}
@@ -260,5 +_,33 @@
@@ -260,5 +_,34 @@
protected AbstractContainerMenu m_6555_(int p_58990_, Inventory p_58991_) {
return new BrewingStandMenu(p_58990_, p_58991_, this, this.f_58971_);
@@ -82,6 +82,7 @@
+
+ @Override
+ public void reviveCaps() {
+ super.reviveCaps();
+ this.handlers = net.minecraftforge.items.wrapper.SidedInvWrapper.create(this, Direction.UP, Direction.DOWN, Direction.NORTH);
}
}