Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 01:17:44 +01:00
Code Issues Projects Releases Wiki Activity

#705: Improve implementation of furnace related block states

Browse Source 
CraftFurnace is the base class for all concrete types of furnaces (this
mimics Minecraft's underlying type hierarchy). It is marked as abstract
now to avoid accidental instantiation.

Also, the various furnace sub types were missing type parameters.
This commit is contained in:
blablubbabc 2020-07-09 08:49:55 +10:00 committed by md_5
parent f222b5bd4e
commit 69fddc725b
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlastFurnace.java
View File

@ -5,7 +5,7 @@ import org.bukkit.Material;
import org.bukkit.block.BlastFurnace; import org.bukkit.block.BlastFurnace;
import org.bukkit.block.Block; import org.bukkit.block.Block;
public class CraftBlastFurnace extends CraftFurnace implements BlastFurnace { public class CraftBlastFurnace extends CraftFurnace<TileEntityBlastFurnace> implements BlastFurnace {
public CraftBlastFurnace(Block block) { public CraftBlastFurnace(Block block) {
super(block, TileEntityBlastFurnace.class); super(block, TileEntityBlastFurnace.class);

2
src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
View File

@ -8,7 +8,7 @@ import org.bukkit.block.Furnace;
import org.bukkit.craftbukkit.inventory.CraftInventoryFurnace; import org.bukkit.craftbukkit.inventory.CraftInventoryFurnace;
import org.bukkit.inventory.FurnaceInventory; import org.bukkit.inventory.FurnaceInventory;
public class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T> implements Furnace { public abstract class CraftFurnace<T extends TileEntityFurnace> extends CraftContainer<T> implements Furnace {
public CraftFurnace(Block block, Class<T> tileEntityClass) { public CraftFurnace(Block block, Class<T> tileEntityClass) {
super(block, tileEntityClass); super(block, tileEntityClass);

2
src/main/java/org/bukkit/craftbukkit/block/CraftFurnaceFurnace.java
View File

@ -4,7 +4,7 @@ import net.minecraft.server.TileEntityFurnaceFurnace;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
public class CraftFurnaceFurnace extends CraftFurnace { public class CraftFurnaceFurnace extends CraftFurnace<TileEntityFurnaceFurnace> {
public CraftFurnaceFurnace(Block block) { public CraftFurnaceFurnace(Block block) {
super(block, TileEntityFurnaceFurnace.class); super(block, TileEntityFurnaceFurnace.class);

2
src/main/java/org/bukkit/craftbukkit/block/CraftSmoker.java
View File

@ -5,7 +5,7 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Smoker; import org.bukkit.block.Smoker;
public class CraftSmoker extends CraftFurnace implements Smoker { public class CraftSmoker extends CraftFurnace<TileEntitySmoker> implements Smoker {
public CraftSmoker(Block block) { public CraftSmoker(Block block) {
super(block, TileEntitySmoker.class); super(block, TileEntitySmoker.class);

7
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@ -23,7 +23,6 @@ import net.minecraft.server.TileEntityDropper;
import net.minecraft.server.TileEntityEnchantTable; import net.minecraft.server.TileEntityEnchantTable;
import net.minecraft.server.TileEntityEndGateway; import net.minecraft.server.TileEntityEndGateway;
import net.minecraft.server.TileEntityEnderChest; import net.minecraft.server.TileEntityEnderChest;
import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityFurnaceFurnace; import net.minecraft.server.TileEntityFurnaceFurnace;
import net.minecraft.server.TileEntityHopper; import net.minecraft.server.TileEntityHopper;
import net.minecraft.server.TileEntityJigsaw; import net.minecraft.server.TileEntityJigsaw;
@ -59,7 +58,7 @@ import org.bukkit.craftbukkit.block.CraftDropper;
import org.bukkit.craftbukkit.block.CraftEnchantingTable; import org.bukkit.craftbukkit.block.CraftEnchantingTable;
import org.bukkit.craftbukkit.block.CraftEndGateway; import org.bukkit.craftbukkit.block.CraftEndGateway;
import org.bukkit.craftbukkit.block.CraftEnderChest; import org.bukkit.craftbukkit.block.CraftEnderChest;
import org.bukkit.craftbukkit.block.CraftFurnace; import org.bukkit.craftbukkit.block.CraftFurnaceFurnace;
import org.bukkit.craftbukkit.block.CraftHopper; import org.bukkit.craftbukkit.block.CraftHopper;
import org.bukkit.craftbukkit.block.CraftJigsaw; import org.bukkit.craftbukkit.block.CraftJigsaw;
import org.bukkit.craftbukkit.block.CraftJukebox; import org.bukkit.craftbukkit.block.CraftJukebox;
@ -333,7 +332,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
if (te == null) { if (te == null) {
te = new TileEntityFurnaceFurnace(); te = new TileEntityFurnaceFurnace();
} }
return new CraftFurnace(material, (TileEntityFurnace) te); return new CraftFurnaceFurnace(material, (TileEntityFurnaceFurnace) te);
case DISPENSER: case DISPENSER:
if (te == null) { if (te == null) {
te = new TileEntityDispenser(); te = new TileEntityDispenser();
@ -560,7 +559,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
valid = blockState instanceof CraftChest; valid = blockState instanceof CraftChest;
break; break;
case FURNACE: case FURNACE:
valid = blockState instanceof CraftFurnace; valid = blockState instanceof CraftFurnaceFurnace;
break; break;
case DISPENSER: case DISPENSER:
valid = blockState instanceof CraftDispenser; valid = blockState instanceof CraftDispenser;