mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
1.20.1 Update
This commit is contained in:
4 files changed
+33
-29
No files matched your search
+7
-4
@@ -43,10 +43,10 @@ ext {
|
||||
]
|
||||
}
|
||||
MAPPING_CHANNEL = 'official'
|
||||
MAPPING_VERSION = '1.20'
|
||||
MC_VERSION = '1.20'
|
||||
MAPPING_VERSION = '1.20.1'
|
||||
MC_VERSION = '1.20.1'
|
||||
MC_NEXT_VERSION = '1.21'
|
||||
MCP_VERSION = '20230608.053357'
|
||||
MCP_VERSION = '20230612.114412'
|
||||
SNAPSHOT = false
|
||||
|
||||
SPI_VERSION = '7.0.0'
|
||||
@@ -885,7 +885,10 @@ project(':forge') {
|
||||
apply plugin: 'net.minecraftforge.gradle.patcher'
|
||||
apply plugin: 'org.cadixdev.licenser'
|
||||
|
||||
applyPatches { verbose = true }
|
||||
applyPatches {
|
||||
verbose = true
|
||||
//failOnError = false
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
MinecraftForge
|
||||
=============
|
||||
[][Download]
|
||||
[][Download] [][Discord] [][Patreon]
|
||||
|
||||
Forge is a free, open-source modding API all of your favourite mods use!
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
--- a/net/minecraft/network/Connection.java
|
||||
+++ b/net/minecraft/network/Connection.java
|
||||
@@ -84,6 +_,7 @@
|
||||
private float f_129477_;
|
||||
private int f_129478_;
|
||||
@@ -86,6 +_,7 @@
|
||||
private boolean f_129479_;
|
||||
@Nullable
|
||||
private volatile Component f_290021_;
|
||||
+ private java.util.function.Consumer<Connection> activationHandler;
|
||||
|
||||
public Connection(PacketFlow p_129482_) {
|
||||
this.f_129466_ = p_129482_;
|
||||
@@ -93,6 +_,7 @@
|
||||
@@ -95,6 +_,7 @@
|
||||
super.channelActive(p_129525_);
|
||||
this.f_129468_ = p_129525_.channel();
|
||||
this.f_129469_ = this.f_129468_.remoteAddress();
|
||||
@@ -16,26 +16,27 @@
|
||||
|
||||
try {
|
||||
this.m_129498_(ConnectionProtocol.HANDSHAKING);
|
||||
@@ -193,7 +_,7 @@
|
||||
}
|
||||
|
||||
f_129465_.debug("Disabled auto read");
|
||||
- this.f_129468_.config().setAutoRead(false);
|
||||
+ this.f_129468_.eventLoop().execute(()->this.f_129468_.config().setAutoRead(false));
|
||||
}
|
||||
|
||||
if (this.f_129468_.eventLoop().inEventLoop()) {
|
||||
@@ -299,7 +_,9 @@
|
||||
@@ -111,8 +_,10 @@
|
||||
public void m_129498_(ConnectionProtocol p_129499_) {
|
||||
this.f_129468_.attr(f_129461_).set(p_129499_);
|
||||
this.f_129468_.attr(BundlerInfo.f_263730_).set(p_129499_);
|
||||
+ this.f_129468_.eventLoop().execute(()-> {
|
||||
this.f_129468_.config().setAutoRead(true);
|
||||
f_129465_.debug("Enabled auto read");
|
||||
+ });
|
||||
}
|
||||
|
||||
public static Connection m_178300_(InetSocketAddress p_178301_, boolean p_178302_) {
|
||||
+ net.minecraftforge.network.DualStackUtils.checkIPv6(p_178301_.getAddress());
|
||||
final Connection connection = new Connection(PacketFlow.CLIENTBOUND);
|
||||
+ connection.activationHandler = net.minecraftforge.network.NetworkHooks::registerClientLoginChannel;
|
||||
public void channelInactive(ChannelHandlerContext p_129527_) {
|
||||
@@ -316,6 +_,8 @@
|
||||
}
|
||||
|
||||
public static ChannelFuture m_290025_(InetSocketAddress p_290034_, boolean p_290035_, final Connection p_290031_) {
|
||||
+ net.minecraftforge.network.DualStackUtils.checkIPv6(p_290034_.getAddress());
|
||||
+ p_290031_.activationHandler = net.minecraftforge.network.NetworkHooks::registerClientLoginChannel;
|
||||
Class<? extends SocketChannel> oclass;
|
||||
LazyLoadedValue<? extends EventLoopGroup> lazyloadedvalue;
|
||||
if (Epoll.isAvailable() && p_178302_) {
|
||||
@@ -332,6 +_,7 @@
|
||||
if (Epoll.isAvailable() && p_290035_) {
|
||||
@@ -347,6 +_,7 @@
|
||||
|
||||
public static Connection m_129493_(SocketAddress p_129494_) {
|
||||
final Connection connection = new Connection(PacketFlow.CLIENTBOUND);
|
||||
@@ -43,14 +44,14 @@
|
||||
(new Bootstrap()).group(f_129464_.m_13971_()).handler(new ChannelInitializer<Channel>() {
|
||||
protected void initChannel(Channel p_129557_) {
|
||||
ChannelPipeline channelpipeline = p_129557_.pipeline();
|
||||
@@ -422,6 +_,14 @@
|
||||
@@ -437,6 +_,14 @@
|
||||
|
||||
public float m_129543_() {
|
||||
return this.f_129477_;
|
||||
+ }
|
||||
+
|
||||
+ public Channel channel() {
|
||||
+ return f_129468_;
|
||||
+ return this.f_129468_;
|
||||
+ }
|
||||
+
|
||||
+ public PacketFlow getDirection() {
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
}
|
||||
|
||||
+ @Override
|
||||
+ public void findBlocks(java.util.function.BiPredicate<BlockState, BlockPos> p_285465_, BiConsumer<BlockPos, BlockState> p_285061_) {
|
||||
+ this.f_62685_.findBlocks(p_285465_, p_285061_);
|
||||
+ public void findBlocks(java.util.function.BiPredicate<BlockState, BlockPos> p_285343_, BiConsumer<BlockPos, BlockState> p_285030_) {
|
||||
+ this.f_62685_.findBlocks(p_285343_, p_285030_);
|
||||
+ }
|
||||
+
|
||||
public TickContainerAccess<Block> m_183531_() {
|
||||
|
||||
Reference in new issue
Block a user