7c2dc4b342
* finish implementing all adventure components in codecs * add some initial tests * Add round trip tests for text and translatable components * Add more round trip test data (score component is failing) * Add more round trip test data * Fix SCORE_COMPONENT_MAP_CODEC * Improve test failure messages * Add failure cases * Add a couple more test data * Make use of AdventureCodecs * Update patches after rebase * Squash changes into adventure patch * Fix AT formatting * update comment --------- Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
50 Zeilen
2.4 KiB
Diff
50 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 1 Jan 2022 23:11:26 -0800
|
|
Subject: [PATCH] Fix FurnaceInventory for smokers and blast furnaces
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
|
|
index e97166d3008cae7897519eaaf56b39c927661098..b835782c9c9b8b47a3ce8727e376f795286299a3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftTileInventoryConverter.java
|
|
@@ -66,7 +66,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
|
|
return new CraftInventory(tileEntity);
|
|
}
|
|
|
|
- public static class Furnace extends CraftTileInventoryConverter {
|
|
+ public static class Furnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
|
|
|
|
@Override
|
|
public Container getTileEntity() {
|
|
@@ -74,6 +74,11 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
|
|
return furnace;
|
|
}
|
|
|
|
+ // Paper start - abstract furnace converter to apply to all 3 furnaces
|
|
+ }
|
|
+
|
|
+ public static abstract class AbstractFurnaceInventoryConverter extends CraftTileInventoryConverter {
|
|
+ // Paper end
|
|
// Paper start
|
|
@Override
|
|
public Inventory createInventory(InventoryHolder owner, InventoryType type, net.kyori.adventure.text.Component title) {
|
|
@@ -171,7 +176,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
|
|
}
|
|
}
|
|
|
|
- public static class BlastFurnace extends CraftTileInventoryConverter {
|
|
+ public static class BlastFurnace extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
|
|
|
|
@Override
|
|
public Container getTileEntity() {
|
|
@@ -187,7 +192,7 @@ public abstract class CraftTileInventoryConverter implements CraftInventoryCreat
|
|
}
|
|
}
|
|
|
|
- public static class Smoker extends CraftTileInventoryConverter {
|
|
+ public static class Smoker extends AbstractFurnaceInventoryConverter { // Paper - Furnace, BlastFurnace, and Smoker are pretty much identical
|
|
|
|
@Override
|
|
public Container getTileEntity() {
|