Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
177 changes: 67 additions & 110 deletions src/main/java/com/sk89q/craftbook/util/ItemUtil.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -514,35 +514,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.SMOOTH_BASALT);
case CACTUS:
return new ItemStack(Material.GREEN_DYE);
case IRON_ORE:
case RAW_IRON:
case DEEPSLATE_IRON_ORE:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case NETHER_GOLD_ORE:
case RAW_GOLD:
case DEEPSLATE_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case RAW_COPPER:
case DEEPSLATE_COPPER_ORE:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case SAND:
case RED_SAND:
return new ItemStack(Material.GLASS);
Expand All@@ -552,8 +523,6 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.NETHER_BRICK);
case CLAY:
return new ItemStack(Material.TERRACOTTA);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case STONE_BRICKS:
return new ItemStack(Material.CRACKED_STONE_BRICKS);
case NETHER_BRICKS:
Expand DownExpand Up@@ -592,6 +561,71 @@ public static ItemStack getSmeltedResult(ItemStack item) {
return new ItemStack(Material.RED_GLAZED_TERRACOTTA);
case BLACK_TERRACOTTA:
return new ItemStack(Material.BLACK_GLAZED_TERRACOTTA);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
case RESIN_CLUMP:
return new ItemStack(Material.RESIN_BRICK);
default:
if (Tag.LOGS_THAT_BURN.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
if (Tag.LEAVES.isTagged(item.getType())) {
return new ItemStack(Material.LEAF_LITTER);
}
return null;
}
}

public static boolean isBlastSmeltable(ItemStack item) {

return getBlastSmeltedResult(item) != null;
}

public static ItemStack getBlastSmeltedResult(ItemStack item) {

switch (item.getType()) {
case IRON_ORE:
case DEEPSLATE_IRON_ORE:
case RAW_IRON:
return new ItemStack(Material.IRON_INGOT);
case COAL_ORE:
case DEEPSLATE_COAL_ORE:
return new ItemStack(Material.COAL);
case LAPIS_ORE:
case DEEPSLATE_LAPIS_ORE:
return new ItemStack(Material.LAPIS_LAZULI);
case REDSTONE_ORE:
case DEEPSLATE_REDSTONE_ORE:
return new ItemStack(Material.REDSTONE, 4);
case EMERALD_ORE:
case DEEPSLATE_EMERALD_ORE:
return new ItemStack(Material.EMERALD);
case GOLD_ORE:
case DEEPSLATE_GOLD_ORE:
case RAW_GOLD:
case NETHER_GOLD_ORE:
return new ItemStack(Material.GOLD_INGOT);
case ANCIENT_DEBRIS:
return new ItemStack(Material.NETHERITE_SCRAP);
case COPPER_ORE:
case DEEPSLATE_COPPER_ORE:
case RAW_COPPER:
return new ItemStack(Material.COPPER_INGOT);
case DIAMOND_ORE:
case DEEPSLATE_DIAMOND_ORE:
return new ItemStack(Material.DIAMOND);
case NETHER_QUARTZ_ORE:
return new ItemStack(Material.QUARTZ);
case IRON_SWORD:
case IRON_PICKAXE:
case IRON_AXE:
Expand All@@ -618,22 +652,7 @@ public static ItemStack getSmeltedResult(ItemStack item) {
case GOLDEN_BOOTS:
case GOLDEN_HORSE_ARMOR:
return new ItemStack(Material.GOLD_NUGGET);
case STONE:
return new ItemStack(Material.SMOOTH_STONE);
case QUARTZ_BLOCK:
return new ItemStack(Material.SMOOTH_QUARTZ);
case SANDSTONE:
return new ItemStack(Material.SMOOTH_SANDSTONE);
case RED_SANDSTONE:
return new ItemStack(Material.SMOOTH_RED_SANDSTONE);
case CHORUS_FRUIT:
return new ItemStack(Material.POPPED_CHORUS_FRUIT);
case SEA_PICKLE:
return new ItemStack(Material.LIME_DYE);
default:
if (Tag.LOGS.isTagged(item.getType())) {
return new ItemStack(Material.CHARCOAL);
}
return null;
}
}
Expand DownExpand Up@@ -700,69 +719,7 @@ public static Material getBoatFromTree(TreeSpecies treeSpecies) {
*/
public static boolean isAFuel(ItemStack item) {

switch(item.getType()) {
case COAL:
case CHARCOAL:
case COAL_BLOCK:
case WOODEN_AXE:
case WOODEN_HOE:
case WOODEN_PICKAXE:
case WOODEN_SHOVEL:
case WOODEN_SWORD:
case STICK:
case OAK_FENCE:
case OAK_FENCE_GATE:
case OAK_TRAPDOOR:
case ACACIA_TRAPDOOR:
case BIRCH_TRAPDOOR:
case DARK_OAK_TRAPDOOR:
case JUNGLE_TRAPDOOR:
case SPRUCE_TRAPDOOR:
case CRAFTING_TABLE:
case CHEST:
case TRAPPED_CHEST:
case JUKEBOX:
case NOTE_BLOCK:
case BROWN_MUSHROOM_BLOCK:
case RED_MUSHROOM_BLOCK:
case BLAZE_ROD:
case LAVA_BUCKET:
case BOOKSHELF:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case SPRUCE_FENCE:
case JUNGLE_FENCE:
case BIRCH_FENCE:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case SPRUCE_FENCE_GATE:
case JUNGLE_FENCE_GATE:
case BIRCH_FENCE_GATE:
case ACACIA_FENCE_GATE:
case DARK_OAK_FENCE_GATE:
case FISHING_ROD:
case BOW:
case LADDER:
case SCAFFOLDING:
case DRIED_KELP_BLOCK:
case BAMBOO:
return true;
default:
return Tag.ITEMS_BOATS.isTagged(item.getType())
|| Tag.WOODEN_DOORS.isTagged(item.getType())
|| Tag.WOOL_CARPETS.isTagged(item.getType())
|| Tag.WOODEN_BUTTONS.isTagged(item.getType())
|| Tag.ITEMS_BANNERS.isTagged(item.getType())
|| Tag.LOGS.isTagged(item.getType())
|| Tag.LEAVES.isTagged(item.getType())
|| Tag.PLANKS.isTagged(item.getType())
|| Tag.WOODEN_STAIRS.isTagged(item.getType())
|| Tag.WOODEN_SLABS.isTagged(item.getType())
|| Tag.SAPLINGS.isTagged(item.getType())
|| Tag.WOOL.isTagged(item.getType())
|| Tag.WOODEN_PRESSURE_PLATES.isTagged(item.getType())
|| Tag.SIGNS.isTagged(item.getType());
}
return item.getType().isFuel();
Comment thread
me4502 marked this conversation as resolved.
}

/**
Expand DownExpand Up@@ -875,7 +832,7 @@ public static List<ItemStack> getRawMaterials(Inventory inv) {

public static boolean isFurnacable(ItemStack item) {

return isCookable(item) || isSmeltable(item);
return isSmeltable(item) || isCookable(item) || isBlastSmeltable(item);
}

public static boolean isItemEdible(ItemStack item) {
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/sk89q/craftbook/util/ItemUtilTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand DownExpand Up@@ -119,13 +120,26 @@ public void testIsCookable() {

ItemStack ingredient = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertTrue(ItemUtil.isCookable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsSmeltable() {

ItemStack ingredient = newMockItemStack(Material.CLAY, (byte) 0, 1);
assertTrue(ItemUtil.isSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.BEDROCK, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
public void testIsBlastSmeltable() {

ItemStack ingredient = newMockItemStack(Material.IRON_ORE, (byte) 0, 1);
assertTrue(ItemUtil.isBlastSmeltable(ingredient));
ItemStack ingredient2 = newMockItemStack(Material.CHICKEN, (byte) 0, 1);
assertFalse(ItemUtil.isCookable(ingredient2));
}

@Test
Expand Down