diff --git a/dev/.includes b/dev/.includes index 5d4d14e..c5220b0 100644 --- a/dev/.includes +++ b/dev/.includes @@ -18,7 +18,6 @@ core/blocks/peat/peat.js core/blocks/peat/tile.js core/blocks/ores.js -core/blocks/glass.js core/blocks/storage.js # ITEMS diff --git a/dev/core/blocks/glass.js b/dev/core/blocks/glass.js deleted file mode 100644 index 8bce5d0..0000000 --- a/dev/core/blocks/glass.js +++ /dev/null @@ -1,115 +0,0 @@ -if (ForestryConfig.glassEnabled) { - Block.setPrototype("forestryGlass", { - type: Block.TYPE_BASE, - - getVariations: function () { - return [ - { - name: "Black Glass", - texture: [["glass_black", 0], ["glass_black", 0], ["glass_black", 0], ["glass_black", 0], ["glass_black", 0], ["glass_black", 0]], - inCreative: true - }, - { - name: "Red Glass", - texture: [["glass_red", 0], ["glass_red", 0], ["glass_red", 0], ["glass_red", 0], ["glass_red", 0], ["glass_red", 0]], - inCreative: true - }, - { - name: "Green Glass", - texture: [["glass_green", 0], ["glass_green", 0], ["glass_green", 0], ["glass_green", 0], ["glass_green", 0], ["glass_green", 0]], - inCreative: true - }, - { - name: "Brown Glass", - texture: [["glass_brown", 0], ["glass_brown", 0], ["glass_brown", 0], ["glass_brown", 0], ["glass_brown", 0], ["glass_brown", 0]], - inCreative: true - }, - { - name: "Blue Glass", - texture: [["glass_blue", 0], ["glass_blue", 0], ["glass_blue", 0], ["glass_blue", 0], ["glass_blue", 0], ["glass_blue", 0]], - inCreative: true - }, - { - name: "Purple Glass", - texture: [["glass_purple", 0], ["glass_purple", 0], ["glass_purple", 0], ["glass_purple", 0], ["glass_purple", 0], ["glass_purple", 0]], - inCreative: true - }, - { - name: "Cyan Glass", - texture: [["glass_cyan", 0], ["glass_cyan", 0], ["glass_cyan", 0], ["glass_cyan", 0], ["glass_cyan", 0], ["glass_cyan", 0]], - inCreative: true - }, - { - name: "Light Gray glass", - texture: [["glass_lightgray", 0], ["glass_lightgray", 0], ["glass_lightgray", 0], ["glass_lightgray", 0], ["glass_lightgray", 0], ["glass_lightgray", 0]], - inCreative: true - }, - { - name: "Gray Glass", - texture: [["glass_gray", 0], ["glass_gray", 0], ["glass_gray", 0], ["glass_gray", 0], ["glass_gray", 0], ["glass_gray", 0]], - inCreative: true - }, - { - name: "Pink Glass", - texture: [["glass_pink", 0], ["glass_pink", 0], ["glass_pink", 0], ["glass_pink", 0], ["glass_pink", 0], ["glass_pink", 0]], - inCreative: true - }, - { - name: "Lime Glass", - texture: [["glass_lime", 0], ["glass_lime", 0], ["glass_lime", 0], ["glass_lime", 0], ["glass_lime", 0], ["glass_lime", 0]], - inCreative: true - }, - { - name: "Yellow Glass", - texture: [["glass_yellow", 0], ["glass_yellow", 0], ["glass_yellow", 0], ["glass_yellow", 0], ["glass_yellow", 0], ["glass_yellow", 0]], - inCreative: true - }, - { - name: "Light Blue Glass", - texture: [["glass_lightblue", 0], ["glass_lightblue", 0], ["glass_lightblue", 0], ["glass_lightblue", 0], ["glass_lightblue", 0], ["glass_lightblue", 0]], - inCreative: true - }, - { - name: "Magenta Glass", - texture: [["glass_magenta", 0], ["glass_magenta", 0], ["glass_magenta", 0], ["glass_magenta", 0], ["glass_magenta", 0], ["glass_magenta", 0]], - inCreative: true - }, - { - name: "Orange Glass", - texture: [["glass_orange", 0], ["glass_orange", 0], ["glass_orange", 0], ["glass_orange", 0], ["glass_orange", 0], ["glass_orange", 0]], - inCreative: true - }, - { - name: "White Glass", - texture: [["glass_white", 0], ["glass_white", 0], ["glass_white", 0], ["glass_white", 0], ["glass_white", 0], ["glass_white", 0]], - inCreative: true - } - ]; - }, - - getDrop: function () { - return []; - } - }); - - ModAPI.addAPICallback("FancyGlass", function (api) { - let fancyGlass = api.bakeModel; - - fancyGlass(BlockID.forestryGlass, 0, "glass_black"); - fancyGlass(BlockID.forestryGlass, 1, "glass_red"); - fancyGlass(BlockID.forestryGlass, 2, "glass_green"); - fancyGlass(BlockID.forestryGlass, 3, "glass_brown"); - fancyGlass(BlockID.forestryGlass, 4, "glass_blue"); - fancyGlass(BlockID.forestryGlass, 5, "glass_purple"); - fancyGlass(BlockID.forestryGlass, 6, "glass_cyan"); - fancyGlass(BlockID.forestryGlass, 7, "glass_lightgray"); - fancyGlass(BlockID.forestryGlass, 8, "glass_gray"); - fancyGlass(BlockID.forestryGlass, 9, "glass_pink"); - fancyGlass(BlockID.forestryGlass, 10, "glass_lime"); - fancyGlass(BlockID.forestryGlass, 11, "glass_yellow"); - fancyGlass(BlockID.forestryGlass, 12, "glass_lightblue"); - fancyGlass(BlockID.forestryGlass, 13, "glass_magenta"); - fancyGlass(BlockID.forestryGlass, 14, "glass_orange"); - fancyGlass(BlockID.forestryGlass, 15, "glass_white"); - }); -} \ No newline at end of file diff --git a/dev/factory/blocks/fabricator/recipes.js b/dev/factory/blocks/fabricator/recipes.js index e07fe94..7676c7c 100644 --- a/dev/factory/blocks/fabricator/recipes.js +++ b/dev/factory/blocks/fabricator/recipes.js @@ -1,15 +1,4 @@ //Smelting -for (let i = 0; i < 16; i++) { - FabricatorManager.addSmelting({ - input: { - id: BlockID.forestryGlass, - data: i - }, - amount: 1, - temperature: 1000 - }); -} - FabricatorManager.addSmelting({ input: { id: 20 @@ -70,61 +59,6 @@ FabricatorManager.addSmelting({ }); //Recipes -for (let i = 0; i < 16; i++) { - FabricatorManager.registerRecipe({ - input: {3: {id: 351, data: i}, 6: {id: ItemID.propolis, data: 0}}, - special: { - id: ItemID.waxCast, - data: 0, - count: 1, - dec: false - }, - result: { - id: BlockID.forestryGlass, - count: 1, - data: i - } - }); -} - -if (ForestryConfig.glassEnabled) { - for (let i = 0; i < 16; i++) { - FabricatorManager.registerRecipe({ - input: {3: {id: 351, data: i}, 6: {id: ItemID.propolisSilky, data: 0}}, - special: { - id: ItemID.waxCast, - data: 0, - count: 1, - dec: false - }, - result: { - id: BlockID.forestryGlass, - count: 1, - data: i - } - }); - - } - - for (let i = 0; i < 16; i++) { - FabricatorManager.registerRecipe({ - input: {3: {id: 351, data: i}, 6: {id: ItemID.propolisPulse, data: 0}}, - special: { - id: ItemID.waxCast, - data: 0, - count: 1, - dec: false - }, - result: { - id: BlockID.forestryGlass, - count: 1, - data: i - } - }); - - } -} - function registerTubeRecipe(itemId, materialId, materialData) { materialData = materialData || 0; FabricatorManager.registerRecipe({ diff --git a/dev/storage/items/backpacks.js b/dev/storage/items/backpacks.js index 2cf057c..7f87ec5 100644 --- a/dev/storage/items/backpacks.js +++ b/dev/storage/items/backpacks.js @@ -157,7 +157,6 @@ BackpackRegistry.register(ItemID.backpackBuilder, { "^glass.+", "^chest.+", "^block.+", - "^forestryGlass$", { id: 98, data: -1 diff --git a/res/terrain-atlas/glass/black/glass_black_0.png b/res/terrain-atlas/glass/black/glass_black_0.png deleted file mode 100644 index a3fec40..0000000 Binary files a/res/terrain-atlas/glass/black/glass_black_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/black/glass_black_1.png b/res/terrain-atlas/glass/black/glass_black_1.png deleted file mode 100644 index 316689f..0000000 Binary files a/res/terrain-atlas/glass/black/glass_black_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/blue/glass_blue_0.png b/res/terrain-atlas/glass/blue/glass_blue_0.png deleted file mode 100644 index fe0586e..0000000 Binary files a/res/terrain-atlas/glass/blue/glass_blue_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/blue/glass_blue_1.png b/res/terrain-atlas/glass/blue/glass_blue_1.png deleted file mode 100644 index 1b02b65..0000000 Binary files a/res/terrain-atlas/glass/blue/glass_blue_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/brown/glass_brown_0.png b/res/terrain-atlas/glass/brown/glass_brown_0.png deleted file mode 100644 index 0d2adad..0000000 Binary files a/res/terrain-atlas/glass/brown/glass_brown_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/brown/glass_brown_1.png b/res/terrain-atlas/glass/brown/glass_brown_1.png deleted file mode 100644 index 9b2a333..0000000 Binary files a/res/terrain-atlas/glass/brown/glass_brown_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/cyan/glass_cyan_0.png b/res/terrain-atlas/glass/cyan/glass_cyan_0.png deleted file mode 100644 index f9f6d71..0000000 Binary files a/res/terrain-atlas/glass/cyan/glass_cyan_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/cyan/glass_cyan_1.png b/res/terrain-atlas/glass/cyan/glass_cyan_1.png deleted file mode 100644 index 8b38bb4..0000000 Binary files a/res/terrain-atlas/glass/cyan/glass_cyan_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/gray/glass_gray_0.png b/res/terrain-atlas/glass/gray/glass_gray_0.png deleted file mode 100644 index dd68cf2..0000000 Binary files a/res/terrain-atlas/glass/gray/glass_gray_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/gray/glass_gray_1.png b/res/terrain-atlas/glass/gray/glass_gray_1.png deleted file mode 100644 index 97b6c22..0000000 Binary files a/res/terrain-atlas/glass/gray/glass_gray_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/green/glass_green_0.png b/res/terrain-atlas/glass/green/glass_green_0.png deleted file mode 100644 index b875cca..0000000 Binary files a/res/terrain-atlas/glass/green/glass_green_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/green/glass_green_1.png b/res/terrain-atlas/glass/green/glass_green_1.png deleted file mode 100644 index 312b9f4..0000000 Binary files a/res/terrain-atlas/glass/green/glass_green_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lightblue/glass_lightblue_0.png b/res/terrain-atlas/glass/lightblue/glass_lightblue_0.png deleted file mode 100644 index ca26a35..0000000 Binary files a/res/terrain-atlas/glass/lightblue/glass_lightblue_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lightblue/glass_lightblue_1.png b/res/terrain-atlas/glass/lightblue/glass_lightblue_1.png deleted file mode 100644 index e4a31fe..0000000 Binary files a/res/terrain-atlas/glass/lightblue/glass_lightblue_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lightgray/glass_lightgray_0.png b/res/terrain-atlas/glass/lightgray/glass_lightgray_0.png deleted file mode 100644 index fcb0a88..0000000 Binary files a/res/terrain-atlas/glass/lightgray/glass_lightgray_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lightgray/glass_lightgray_1.png b/res/terrain-atlas/glass/lightgray/glass_lightgray_1.png deleted file mode 100644 index 8cd7a8b..0000000 Binary files a/res/terrain-atlas/glass/lightgray/glass_lightgray_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lime/glass_lime_0.png b/res/terrain-atlas/glass/lime/glass_lime_0.png deleted file mode 100644 index d1da44a..0000000 Binary files a/res/terrain-atlas/glass/lime/glass_lime_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/lime/glass_lime_1.png b/res/terrain-atlas/glass/lime/glass_lime_1.png deleted file mode 100644 index d121be3..0000000 Binary files a/res/terrain-atlas/glass/lime/glass_lime_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/magenta/glass_magenta_0.png b/res/terrain-atlas/glass/magenta/glass_magenta_0.png deleted file mode 100644 index cedb43d..0000000 Binary files a/res/terrain-atlas/glass/magenta/glass_magenta_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/magenta/glass_magenta_1.png b/res/terrain-atlas/glass/magenta/glass_magenta_1.png deleted file mode 100644 index e5a45b4..0000000 Binary files a/res/terrain-atlas/glass/magenta/glass_magenta_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/orange/glass_orange_0.png b/res/terrain-atlas/glass/orange/glass_orange_0.png deleted file mode 100644 index 05d6ad8..0000000 Binary files a/res/terrain-atlas/glass/orange/glass_orange_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/orange/glass_orange_1.png b/res/terrain-atlas/glass/orange/glass_orange_1.png deleted file mode 100644 index 3741ed7..0000000 Binary files a/res/terrain-atlas/glass/orange/glass_orange_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/pink/glass_pink_0.png b/res/terrain-atlas/glass/pink/glass_pink_0.png deleted file mode 100644 index ca1f892..0000000 Binary files a/res/terrain-atlas/glass/pink/glass_pink_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/pink/glass_pink_1.png b/res/terrain-atlas/glass/pink/glass_pink_1.png deleted file mode 100644 index 3aafe62..0000000 Binary files a/res/terrain-atlas/glass/pink/glass_pink_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/purple/glass_purple_0.png b/res/terrain-atlas/glass/purple/glass_purple_0.png deleted file mode 100644 index a4b5a80..0000000 Binary files a/res/terrain-atlas/glass/purple/glass_purple_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/purple/glass_purple_1.png b/res/terrain-atlas/glass/purple/glass_purple_1.png deleted file mode 100644 index 8a95737..0000000 Binary files a/res/terrain-atlas/glass/purple/glass_purple_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/red/glass_red_0.png b/res/terrain-atlas/glass/red/glass_red_0.png deleted file mode 100644 index 8adf848..0000000 Binary files a/res/terrain-atlas/glass/red/glass_red_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/red/glass_red_1.png b/res/terrain-atlas/glass/red/glass_red_1.png deleted file mode 100644 index b275a54..0000000 Binary files a/res/terrain-atlas/glass/red/glass_red_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/white/glass_white_0.png b/res/terrain-atlas/glass/white/glass_white_0.png deleted file mode 100644 index 5cc360c..0000000 Binary files a/res/terrain-atlas/glass/white/glass_white_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/white/glass_white_1.png b/res/terrain-atlas/glass/white/glass_white_1.png deleted file mode 100644 index 89114e7..0000000 Binary files a/res/terrain-atlas/glass/white/glass_white_1.png and /dev/null differ diff --git a/res/terrain-atlas/glass/yellow/glass_yellow_0.png b/res/terrain-atlas/glass/yellow/glass_yellow_0.png deleted file mode 100644 index 23c5cac..0000000 Binary files a/res/terrain-atlas/glass/yellow/glass_yellow_0.png and /dev/null differ diff --git a/res/terrain-atlas/glass/yellow/glass_yellow_1.png b/res/terrain-atlas/glass/yellow/glass_yellow_1.png deleted file mode 100644 index 1166894..0000000 Binary files a/res/terrain-atlas/glass/yellow/glass_yellow_1.png and /dev/null differ