Skip to content
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.

Sign up for GitHub

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

Dev/1.20.1 #407

Merged
merged 5 commits into from
Feb 24, 2025
+19 −3
Merged

Dev/1.20.1 #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4ffbf7
Add static canBurn back to AbstractFurnaceBlockEntity
C0D3-M4513R Feb 24, 2025
1fba22b
Rewrite static initializer of CraftChatMessage to not throw on duplic…
C0D3-M4513R Feb 24, 2025
4ef1f2c
Fix FakeCreative not finding `nextContainerCounter`
C0D3-M4513R Feb 24, 2025
4716f7e
Fix Denizens not finding `PlayerList.remove`
C0D3-M4513R Feb 24, 2025
5c01a48
Version 0.4.8
C0D3-M4513R Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.daemon=false
JAVA_VERSION=17
MC_VERSION=1.20.1
FORGE_VERSION=47.3.29
KETTING_VERSION=0.4.7
KETTING_VERSION=0.4.8
MC_NEXT_VERSION=1.21
MCP_VERSION=20230612.114412
MAPPING_CHANNEL=official
Expand Down
7 changes: 6 additions & 1 deletion ...es/minecraft/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,16 @@
p_155017_.setRecipeUsed(recipe);
}

@@ -295,7 +_,7 @@
@@ -295,7 +_,12 @@

}

- private static boolean canBurn(RegistryAccess p_266924_, @Nullable Recipe<?> p_155006_, NonNullList<ItemStack> p_155007_, int p_155008_) {
+ static final AbstractFurnaceBlockEntity $ketting_furnace = new FurnaceBlockEntity(new net.minecraft.core.BlockPos(0, 0, 0), net.minecraft.world.level.block.Blocks.FURNACE.defaultBlockState());
+ @SuppressWarnings("unused")
+ private static boolean canBurn_static(RegistryAccess p_266924_, @Nullable Recipe<?> p_155006_, NonNullList<ItemStack> p_155007_, int p_155008_) {
+ return $ketting_furnace.canBurn(p_266924_, p_155006_, p_155007_, p_155008_);
+ }
+ private boolean canBurn(RegistryAccess p_266924_, @Nullable Recipe<?> p_155006_, NonNullList<ItemStack> p_155007_, int p_155008_) {
if (!p_155007_.get(0).isEmpty() && p_155006_ != null) {
ItemStack itemstack = p_155006_.getResultItem(p_266924_);
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/org/bukkit/craftbukkit/v1_20_R1/util/CraftChatMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraft.network.chat.contents.LiteralContents;
import net.minecraft.network.chat.contents.TranslatableContents;
import org.bukkit.ChatColor;
import org.kettingpowered.ketting.core.Ketting;

public final class CraftChatMessage {

Expand All @@ -28,8 +29,15 @@ public final class CraftChatMessage {

static {
Builder<Character, ChatFormatting> builder = ImmutableMap.builder();
java.util.HashMap<Character, ChatFormatting> check = new java.util.HashMap<>();
for (ChatFormatting format : ChatFormatting.values()) {
builder.put(Character.toLowerCase(format.toString().charAt(1)), format);
final Character chr = Character.toLowerCase(format.toString().charAt(1));
final ChatFormatting dupe = check.put(chr, format);
if (dupe != null) {
Ketting.LOGGER.warn("Skipping Duplicate ChatFormatting: §{}, original formatting: {}, duplicate formatting: {}", chr, dupe, format);
} else {
builder.put(chr, format);
}
}
formatMap = builder.build();
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/mapping/bukkit_srg.srg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13889,6 +13889,7 @@ net/minecraft/server/level/EntityPlayer net/minecraft/server/level/ServerPlayer
gn ()V m_9215_
go ()Z m_9216_
gp ()V m_9217_
gp ()I nextContainerCounterInt
gq ()Z m_240422_
h ()V m_143429_
i (Lnet/minecraft/core/BlockPosition;)Z m_9222_
Expand Down Expand Up @@ -14047,6 +14048,7 @@ net/minecraft/server/players/PlayerList net/minecraft/server/players/PlayerList
c (Lcom/mojang/authlib/GameProfile;)Z m_5764_
c (Lnet/minecraft/server/level/EntityPlayer;)V m_11286_
c (Lnet/minecraft/server/level/EntityPlayer;)Ljava/lang/String; removeString
remove (Lnet/minecraft/server/level/EntityPlayer;)Ljava/lang/String; removeString
d ()V m_11288_
d (Lcom/mojang/authlib/GameProfile;)Z m_5765_
d (Lnet/minecraft/server/level/EntityPlayer;)V m_11289_
Expand Down Expand Up @@ -48598,6 +48600,7 @@ net/minecraft/world/level/block/entity/TileEntityFurnace net/minecraft/world/lev
a (Ljava/util/Map;Lnet/minecraft/tags/TagKey;I)V m_204302_
a (Ljava/util/Map;Lnet/minecraft/world/level/IMaterial;I)V m_58374_
a (Lnet/minecraft/core/EnumDirection;)[I m_7071_
canBurn (Lnet/minecraft/core/IRegistryCustom;Lnet/minecraft/world/item/crafting/IRecipe;Lnet/minecraft/core/NonNullList;I)Z canBurn_static
a (Lnet/minecraft/core/IRegistryCustom;Lnet/minecraft/world/item/crafting/IRecipe;Lnet/minecraft/core/NonNullList;I)Z m_155005_
a (Lnet/minecraft/nbt/NBTTagCompound;)V m_142466_
a (Lnet/minecraft/nbt/NBTTagCompound;Lnet/minecraft/resources/MinecraftKey;Ljava/lang/Integer;)V m_187447_
Expand Down
Loading