From 6c400e17b5d264cae4da48c1c69fa52cfb89a889 Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Tue, 7 Jan 2025 20:38:35 -0600 Subject: [PATCH 1/8] Update CraftTweaker and add ContentCreator. Add Wyrmwood slabs, Wyrmwood stairs, and menril slabs. --- .../contentcreator/blockstates/end_slab.json | 22 +++ .../blockstates/end_slab_double.json | 23 +++ .../blockstates/end_stairs.json | 184 ++++++++++++++++++ .../blockstates/menril_planks_slab.json | 22 +++ .../menril_planks_slab_double.json | 23 +++ src/resources/contentcreator/lang/en_us.lang | 3 + .../models/item/end_stairs.json | 8 + src/scripts/Events.zs | 27 ++- src/scripts/OredictPatches.zs | 6 +- src/scripts/contentcreator/wood_slabs.zs | 21 ++ src/scripts/ct/CoT.zs | 10 +- src/scripts/ct/Properties.zs | 13 +- 12 files changed, 351 insertions(+), 11 deletions(-) create mode 100644 src/resources/contentcreator/blockstates/end_slab.json create mode 100644 src/resources/contentcreator/blockstates/end_slab_double.json create mode 100644 src/resources/contentcreator/blockstates/end_stairs.json create mode 100644 src/resources/contentcreator/blockstates/menril_planks_slab.json create mode 100644 src/resources/contentcreator/blockstates/menril_planks_slab_double.json create mode 100644 src/resources/contentcreator/lang/en_us.lang create mode 100644 src/resources/contentcreator/models/item/end_stairs.json create mode 100644 src/scripts/contentcreator/wood_slabs.zs diff --git a/src/resources/contentcreator/blockstates/end_slab.json b/src/resources/contentcreator/blockstates/end_slab.json new file mode 100644 index 00000000..7dd34d65 --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"stygian:block/endplanks", + "bottom":"stygian:block/endplanks", + "side":"stygian:block/endplanks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_slab_double.json b/src/resources/contentcreator/blockstates/end_slab_double.json new file mode 100644 index 00000000..6f7d3c3a --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_stairs.json b/src/resources/contentcreator/blockstates/end_stairs.json new file mode 100644 index 00000000..236f3989 --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stairs.json @@ -0,0 +1,184 @@ +{ + "forge_marker": 1, + "ambient_occlusion": false, + "defaults": { + "textures": { + "bottom": "stygian:block/endplanks", + "top": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + }, + "uvlock": true + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180 + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180 + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180 + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180 + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180 + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/menril_planks_slab.json b/src/resources/contentcreator/blockstates/menril_planks_slab.json new file mode 100644 index 00000000..1c61c123 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_planks_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"integrateddynamics:blocks/menril_planks", + "bottom":"integrateddynamics:blocks/menril_planks", + "side":"integrateddynamics:blocks/menril_planks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/menril_planks_slab_double.json b/src/resources/contentcreator/blockstates/menril_planks_slab_double.json new file mode 100644 index 00000000..4e0c3f6c --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_planks_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "integrateddynamics:blocks/menril_planks", + "side": "integrateddynamics:blocks/menril_planks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/lang/en_us.lang b/src/resources/contentcreator/lang/en_us.lang new file mode 100644 index 00000000..109f899d --- /dev/null +++ b/src/resources/contentcreator/lang/en_us.lang @@ -0,0 +1,3 @@ +tile.contentcreator.end_slab.name=Wyrmwood Slab +tile.contentcreator.end_stairs.name=Wyrmwood Stairs +tile.contentcreator.menril_planks_slab.name=Menril Wood Slab \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/end_stairs.json b/src/resources/contentcreator/models/item/end_stairs.json new file mode 100644 index 00000000..384ae83f --- /dev/null +++ b/src/resources/contentcreator/models/item/end_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "stygian:block/endplanks", + "top": "stygian:block/endplanks", + "side": "stygian:block/endplanks" + } +} \ No newline at end of file diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 8c5daff6..8154c918 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -18,19 +18,30 @@ import scripts.ct.Function; //every ender teleport now creates a extraterrestrail matter on the ground events.onEnderTeleport(function(event as EnderTeleportEvent) { if (!event.entityLivingBase.world.remote && event.entityLivingBase instanceof IPlayer) { - event.entityLivingBase.world.spawnEntity(.createEntityItem(event.entityLivingBase.world, event.targetX, event.targetY, event.targetZ)); + event.entityLivingBase.world.spawnEntity(.createEntityItem(event.entityLivingBase.world, event.targetX as float, event.targetY as float, event.targetZ as float)); } }); //breaking endstone with hands now drops endstone shards +//Also fixes Wyrmwood and menril double slabs not dropping themselves static blacklist as IItemStack[] = [, , , ] as IItemStack[]; events.onBlockBreak(function(event as BlockBreakEvent) { - if (!event.world.remote && event.blockState == && event.isPlayer && !extrautilities2.Tweaker.XUTweaker.isPlayerFake(event.player) && event.player.creative == false) { - var item = event.player.currentItem; - if (isNull(item) || (!item.canHarvestBlock() && !(blacklist has item.definition.makeStack()))) { - var r = Math.random() * 2 + 2; - for i in 0 to r { - event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); + if (!event.world.remote && !(event.isPlayer && event.player.creative)) { + if (event.blockState == && event.isPlayer && !extrautilities2.Tweaker.XUTweaker.isPlayerFake(event.player)) { + var item = event.player.currentItem; + if (isNull(item) || (!item.canHarvestBlock() && !(blacklist has item.definition.makeStack()))) { + var r = Math.random() * 2 + 2; + for i in 0 to r { + event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); + } + } + } else if (event.blockState == ) { + for i in 0 .. 2 { + event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); + } + } else if (event.blockState == ) { + for i in 0 .. 2 { + event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); } } } @@ -87,7 +98,7 @@ events.onPlayerTick(function(event as PlayerTickEvent) { if data has "FallingDistance" { var distance = data.memberGet("FallingDistance") as int; if distance >= 100 { - event.player.world.spawnEntity(.withTag({EasterEgg: 1}).createEntityItem(event.player.world, player.x, 255, player.z)); + event.player.world.spawnEntity(.withTag({EasterEgg: 1}).createEntityItem(event.player.world, player.x as float, 255 as float, player.z as float)); player.update(data + {"FallingDistance": distance - 100}); } } diff --git a/src/scripts/OredictPatches.zs b/src/scripts/OredictPatches.zs index 8a0fbace..83434aa9 100644 --- a/src/scripts/OredictPatches.zs +++ b/src/scripts/OredictPatches.zs @@ -41,4 +41,8 @@ .addItems([]); //Warp -.addItems([]); \ No newline at end of file +.addItems([]); + +//New wooden slabs and stairs +.addItems([, ]); +.addItems([]); \ No newline at end of file diff --git a/src/scripts/contentcreator/wood_slabs.zs b/src/scripts/contentcreator/wood_slabs.zs new file mode 100644 index 00000000..dd03d03d --- /dev/null +++ b/src/scripts/contentcreator/wood_slabs.zs @@ -0,0 +1,21 @@ +#loader preinit +import mods.contenttweaker.VanillaFactory; +import contentcreator.block.GenericBlock; +import crafttweaker.block.IMaterial; + +//Wyrmwood +var wyrmwood_slab = GenericBlock.createSlab(IMaterial.wood(), "end_slab"); +wyrmwood_slab.setStrength(2.0, 3.0); +wyrmwood_slab.setSoundType(); +wyrmwood_slab.setHarvestLevel("axe", 0); +wyrmwood_slab.register(); + +var wyrmwood_stairs = GenericBlock.createStairs("end_stairs", ); +wyrmwood_stairs.register(); + +//Menril wood +var menril_planks_slab = GenericBlock.createSlab(IMaterial.wood(), "menril_planks_slab"); +menril_planks_slab.setStrength(2.0, 3.0); +menril_planks_slab.setSoundType(); +menril_planks_slab.setHarvestLevel("axe", 0); +menril_planks_slab.register(); \ No newline at end of file diff --git a/src/scripts/ct/CoT.zs b/src/scripts/ct/CoT.zs index a9085c4f..fa727c0a 100644 --- a/src/scripts/ct/CoT.zs +++ b/src/scripts/ct/CoT.zs @@ -92,4 +92,12 @@ recipes.addShaped(, [[.withTag({Fluid //Dilithium recipes.addShapeless(, [, , , , , , , , ]); -recipes.addShapeless( * 9, []); \ No newline at end of file +recipes.addShapeless( * 9, []); + +//New wooden slabs and stairs +recipes.addShaped(*6, [[, , ]]); +recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); +recipes.addShapeless(, [, ]); + +recipes.addShaped(*6, [[, , ]]); +recipes.addShapeless(, [, ]); \ No newline at end of file diff --git a/src/scripts/ct/Properties.zs b/src/scripts/ct/Properties.zs index 28252c7f..5a3f1b5a 100644 --- a/src/scripts/ct/Properties.zs +++ b/src/scripts/ct/Properties.zs @@ -11,4 +11,15 @@ endstone.hardness = 1.5; //Portals are now unbreakable var portal = .block.definition; -portal.hardness = -1; \ No newline at end of file +portal.hardness = -1; + +//ContentCreator doesn't set double slab properties correctly. So we have to set them here +var wyrmwood_slab_double = .block.definition; +wyrmwood_slab_double.hardness = 2; +wyrmwood_slab_double.resistance = 3; +wyrmwood_slab_double.setHarvestLevel("axe", 0); + +var menril_planks_slab_double = .block.definition; +menril_planks_slab_double.hardness = 2; +menril_planks_slab_double.resistance = 3; +menril_planks_slab_double.setHarvestLevel("axe", 0); \ No newline at end of file From 3eb8fcdf4d3bb09d1426f3451373626576b86c1d Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Sat, 11 Jan 2025 13:20:44 -0600 Subject: [PATCH 2/8] Add End Stone Brick slabs and stairs --- .../blockstates/end_stone_brick_slab.json | 22 +++ .../end_stone_brick_slab_double.json | 23 +++ .../blockstates/end_stone_brick_stairs.json | 184 ++++++++++++++++++ src/resources/contentcreator/lang/en_us.lang | 5 +- .../models/item/end_stone_brick_stairs.json | 8 + src/scripts/Events.zs | 9 + .../contentcreator/end_stone_bricks.zs | 17 ++ src/scripts/ct/CoT.zs | 7 +- src/scripts/ct/Properties.zs | 7 +- 9 files changed, 279 insertions(+), 3 deletions(-) create mode 100644 src/resources/contentcreator/blockstates/end_stone_brick_slab.json create mode 100644 src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json create mode 100644 src/resources/contentcreator/blockstates/end_stone_brick_stairs.json create mode 100644 src/resources/contentcreator/models/item/end_stone_brick_stairs.json create mode 100644 src/scripts/contentcreator/end_stone_bricks.zs diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_slab.json b/src/resources/contentcreator/blockstates/end_stone_brick_slab.json new file mode 100644 index 00000000..e79378d3 --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_slab.json @@ -0,0 +1,22 @@ +{ + "forge_marker":1, + "defaults":{ + "transform":"forge:default-block", + "model":"half_slab", + "textures":{ + "top":"minecraft:blocks/end_bricks", + "bottom":"minecraft:blocks/end_bricks", + "side":"minecraft:blocks/end_bricks" + } + }, + "variants":{ + "half":{ + "bottom":{}, + "top":{"model":"upper_slab"} + }, + "variant":{ + "normal":{} + }, + "inventory":[{}] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json b/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json new file mode 100644 index 00000000..0e34187a --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_slab_double.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "transform": "forge:default-block", + "model": "cube_column", + "textures": { + "end": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + } + }, + "variants": { + "half": { + "bottom": {}, + "top": {} + }, + "variant": { + "normal": {} + }, + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json b/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json new file mode 100644 index 00000000..d71f61ba --- /dev/null +++ b/src/resources/contentcreator/blockstates/end_stone_brick_stairs.json @@ -0,0 +1,184 @@ +{ + "forge_marker": 1, + "ambient_occlusion": false, + "defaults": { + "textures": { + "bottom": "minecraft:blocks/end_bricks", + "top": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + }, + "uvlock": true + }, + "variants": { + "facing=east,half=bottom,shape=straight": { + "model": "stairs" + }, + "facing=west,half=bottom,shape=straight": { + "model": "stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=straight": { + "model": "stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=straight": { + "model": "stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "outer_stairs" + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "outer_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "outer_stairs" + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "outer_stairs", + "y": 180 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "inner_stairs" + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 180 + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 90 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "inner_stairs", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 270 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 90 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "inner_stairs" + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "inner_stairs", + "y": 180 + }, + "facing=east,half=top,shape=straight": { + "model": "stairs", + "x": 180 + }, + "facing=west,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=straight": { + "model": "stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=outer_right": { + "model": "outer_stairs", + "x": 180 + }, + "facing=east,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180 + }, + "facing=west,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=outer_left": { + "model": "outer_stairs", + "x": 180, + "y": 270 + }, + "facing=east,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=north,half=top,shape=inner_right": { + "model": "inner_stairs", + "x": 180 + }, + "facing=east,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 90 + }, + "facing=north,half=top,shape=inner_left": { + "model": "inner_stairs", + "x": 180, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/lang/en_us.lang b/src/resources/contentcreator/lang/en_us.lang index 109f899d..0ba6a509 100644 --- a/src/resources/contentcreator/lang/en_us.lang +++ b/src/resources/contentcreator/lang/en_us.lang @@ -1,3 +1,6 @@ tile.contentcreator.end_slab.name=Wyrmwood Slab tile.contentcreator.end_stairs.name=Wyrmwood Stairs -tile.contentcreator.menril_planks_slab.name=Menril Wood Slab \ No newline at end of file +tile.contentcreator.menril_planks_slab.name=Menril Wood Slab + +tile.contentcreator.end_stone_brick_slab.name=End Stone Brick Slab +tile.contentcreator.end_stone_brick_stairs.name=End Stone Brick Stairs \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/end_stone_brick_stairs.json b/src/resources/contentcreator/models/item/end_stone_brick_stairs.json new file mode 100644 index 00000000..85938185 --- /dev/null +++ b/src/resources/contentcreator/models/item/end_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "minecraft:blocks/end_bricks", + "top": "minecraft:blocks/end_bricks", + "side": "minecraft:blocks/end_bricks" + } +} \ No newline at end of file diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 8154c918..2d655b6b 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -43,6 +43,15 @@ events.onBlockBreak(function(event as BlockBreakEvent) { for i in 0 .. 2 { event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); } + } else if (event.blockState == ) { + for type in event.player.currentItem.toolClasses { + if(event.block.definition.isToolEffective(type, event.blockState)) { + for i in 0 .. 2 { + event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); + } + return; + } + } } } }); diff --git a/src/scripts/contentcreator/end_stone_bricks.zs b/src/scripts/contentcreator/end_stone_bricks.zs new file mode 100644 index 00000000..5ef8f906 --- /dev/null +++ b/src/scripts/contentcreator/end_stone_bricks.zs @@ -0,0 +1,17 @@ +#loader preinit +import mods.contenttweaker.VanillaFactory; +import contentcreator.block.GenericBlock; +import crafttweaker.block.IMaterial; + +//Wyrmwood +var end_stone_brick_slab = GenericBlock.createSlab(IMaterial.rock(), "end_stone_brick_slab"); +end_stone_brick_slab.setStrength(1.5, 9.0); +end_stone_brick_slab.setSoundType(); +end_stone_brick_slab.setHarvestLevel("pickaxe", 0); +end_stone_brick_slab.register(); + +var end_stone_brick_stairs = GenericBlock.createStairs("end_stone_brick_stairs", ); +end_stone_brick_stairs.setStrength(1.5, 9.0); +end_stone_brick_stairs.setSoundType(); +end_stone_brick_stairs.setHarvestLevel("pickaxe", 0); +end_stone_brick_stairs.register(); \ No newline at end of file diff --git a/src/scripts/ct/CoT.zs b/src/scripts/ct/CoT.zs index fa727c0a..d4af90a3 100644 --- a/src/scripts/ct/CoT.zs +++ b/src/scripts/ct/CoT.zs @@ -100,4 +100,9 @@ recipes.addShapedMirrored(*4, [[, recipes.addShapeless(, [, ]); recipes.addShaped(*6, [[, , ]]); -recipes.addShapeless(, [, ]); \ No newline at end of file +recipes.addShapeless(, [, ]); + +//End Stone Brick Slabs and Stairs +recipes.addShaped(*6, [[, , ]]); +recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); +recipes.addShapeless(, [, ]); \ No newline at end of file diff --git a/src/scripts/ct/Properties.zs b/src/scripts/ct/Properties.zs index 5a3f1b5a..3121cd92 100644 --- a/src/scripts/ct/Properties.zs +++ b/src/scripts/ct/Properties.zs @@ -22,4 +22,9 @@ wyrmwood_slab_double.setHarvestLevel("axe", 0); var menril_planks_slab_double = .block.definition; menril_planks_slab_double.hardness = 2; menril_planks_slab_double.resistance = 3; -menril_planks_slab_double.setHarvestLevel("axe", 0); \ No newline at end of file +menril_planks_slab_double.setHarvestLevel("axe", 0); + +var end_stone_brick_slab_double = .block.definition; +end_stone_brick_slab_double.hardness = 1.5; +end_stone_brick_slab_double.resistance = 9; +end_stone_brick_slab_double.setHarvestLevel("pickaxe", 0); \ No newline at end of file From 08e63ae86085bb2b47185b0db79d2382ddd6dda6 Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Sat, 11 Jan 2025 13:22:37 -0600 Subject: [PATCH 3/8] Rename "end_slab" and "end_stairs" to "wyrmwood_slab" and "wyrmwood_stairs". From now on, new item ids will follow the post 1.13 naming convention. --- .../blockstates/{end_slab.json => wyrmwood_slab.json} | 0 .../{end_slab_double.json => wyrmwood_slab_double.json} | 0 .../blockstates/{end_stairs.json => wyrmwood_stairs.json} | 0 src/resources/contentcreator/lang/en_us.lang | 4 ++-- .../models/item/{end_stairs.json => wyrmwood_stairs.json} | 0 src/scripts/Events.zs | 4 ++-- src/scripts/OredictPatches.zs | 4 ++-- src/scripts/contentcreator/wood_slabs.zs | 4 ++-- src/scripts/ct/CoT.zs | 6 +++--- src/scripts/ct/Properties.zs | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename src/resources/contentcreator/blockstates/{end_slab.json => wyrmwood_slab.json} (100%) rename src/resources/contentcreator/blockstates/{end_slab_double.json => wyrmwood_slab_double.json} (100%) rename src/resources/contentcreator/blockstates/{end_stairs.json => wyrmwood_stairs.json} (100%) rename src/resources/contentcreator/models/item/{end_stairs.json => wyrmwood_stairs.json} (100%) diff --git a/src/resources/contentcreator/blockstates/end_slab.json b/src/resources/contentcreator/blockstates/wyrmwood_slab.json similarity index 100% rename from src/resources/contentcreator/blockstates/end_slab.json rename to src/resources/contentcreator/blockstates/wyrmwood_slab.json diff --git a/src/resources/contentcreator/blockstates/end_slab_double.json b/src/resources/contentcreator/blockstates/wyrmwood_slab_double.json similarity index 100% rename from src/resources/contentcreator/blockstates/end_slab_double.json rename to src/resources/contentcreator/blockstates/wyrmwood_slab_double.json diff --git a/src/resources/contentcreator/blockstates/end_stairs.json b/src/resources/contentcreator/blockstates/wyrmwood_stairs.json similarity index 100% rename from src/resources/contentcreator/blockstates/end_stairs.json rename to src/resources/contentcreator/blockstates/wyrmwood_stairs.json diff --git a/src/resources/contentcreator/lang/en_us.lang b/src/resources/contentcreator/lang/en_us.lang index 0ba6a509..3f445458 100644 --- a/src/resources/contentcreator/lang/en_us.lang +++ b/src/resources/contentcreator/lang/en_us.lang @@ -1,5 +1,5 @@ -tile.contentcreator.end_slab.name=Wyrmwood Slab -tile.contentcreator.end_stairs.name=Wyrmwood Stairs +tile.contentcreator.wyrmwood_slab.name=Wyrmwood Slab +tile.contentcreator.wyrmwood_stairs.name=Wyrmwood Stairs tile.contentcreator.menril_planks_slab.name=Menril Wood Slab tile.contentcreator.end_stone_brick_slab.name=End Stone Brick Slab diff --git a/src/resources/contentcreator/models/item/end_stairs.json b/src/resources/contentcreator/models/item/wyrmwood_stairs.json similarity index 100% rename from src/resources/contentcreator/models/item/end_stairs.json rename to src/resources/contentcreator/models/item/wyrmwood_stairs.json diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 2d655b6b..208de572 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -35,9 +35,9 @@ events.onBlockBreak(function(event as BlockBreakEvent) { event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); } } - } else if (event.blockState == ) { + } else if (event.blockState == ) { for i in 0 .. 2 { - event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); + event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); } } else if (event.blockState == ) { for i in 0 .. 2 { diff --git a/src/scripts/OredictPatches.zs b/src/scripts/OredictPatches.zs index 83434aa9..f47ab210 100644 --- a/src/scripts/OredictPatches.zs +++ b/src/scripts/OredictPatches.zs @@ -44,5 +44,5 @@ .addItems([]); //New wooden slabs and stairs -.addItems([, ]); -.addItems([]); \ No newline at end of file +.addItems([, ]); +.addItems([]); \ No newline at end of file diff --git a/src/scripts/contentcreator/wood_slabs.zs b/src/scripts/contentcreator/wood_slabs.zs index dd03d03d..f746f51b 100644 --- a/src/scripts/contentcreator/wood_slabs.zs +++ b/src/scripts/contentcreator/wood_slabs.zs @@ -4,13 +4,13 @@ import contentcreator.block.GenericBlock; import crafttweaker.block.IMaterial; //Wyrmwood -var wyrmwood_slab = GenericBlock.createSlab(IMaterial.wood(), "end_slab"); +var wyrmwood_slab = GenericBlock.createSlab(IMaterial.wood(), "wyrmwood_slab"); wyrmwood_slab.setStrength(2.0, 3.0); wyrmwood_slab.setSoundType(); wyrmwood_slab.setHarvestLevel("axe", 0); wyrmwood_slab.register(); -var wyrmwood_stairs = GenericBlock.createStairs("end_stairs", ); +var wyrmwood_stairs = GenericBlock.createStairs("wyrmwood_stairs", ); wyrmwood_stairs.register(); //Menril wood diff --git a/src/scripts/ct/CoT.zs b/src/scripts/ct/CoT.zs index d4af90a3..56a1bc7e 100644 --- a/src/scripts/ct/CoT.zs +++ b/src/scripts/ct/CoT.zs @@ -95,9 +95,9 @@ recipes.addShapeless(, [, * 9, []); //New wooden slabs and stairs -recipes.addShaped(*6, [[, , ]]); -recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); -recipes.addShapeless(, [, ]); +recipes.addShaped(*6, [[, , ]]); +recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); +recipes.addShapeless(, [, ]); recipes.addShaped(*6, [[, , ]]); recipes.addShapeless(, [, ]); diff --git a/src/scripts/ct/Properties.zs b/src/scripts/ct/Properties.zs index 3121cd92..b796fbad 100644 --- a/src/scripts/ct/Properties.zs +++ b/src/scripts/ct/Properties.zs @@ -14,7 +14,7 @@ var portal = .block.definition portal.hardness = -1; //ContentCreator doesn't set double slab properties correctly. So we have to set them here -var wyrmwood_slab_double = .block.definition; +var wyrmwood_slab_double = .block.definition; wyrmwood_slab_double.hardness = 2; wyrmwood_slab_double.resistance = 3; wyrmwood_slab_double.setHarvestLevel("axe", 0); From 1c363af0244b69596628edcaa3c682007f7ccaa8 Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:38:12 -0600 Subject: [PATCH 4/8] Rename menril planks slab to menril slab. Add fences and fence gates to wyrmwood and menril --- .../blockstates/menril_fence.json | 44 +++++++++++++++++++ .../blockstates/menril_fence_gate.json | 36 +++++++++++++++ ...nril_planks_slab.json => menril_slab.json} | 0 ...ab_double.json => menril_slab_double.json} | 0 .../blockstates/wyrmwood_fence.json | 44 +++++++++++++++++++ .../blockstates/wyrmwood_fence_gate.json | 36 +++++++++++++++ src/resources/contentcreator/lang/en_us.lang | 7 ++- .../block/menril_fence_gate_closed.json | 6 +++ .../models/block/menril_fence_gate_open.json | 6 +++ .../models/block/menril_wall_gate_closed.json | 6 +++ .../models/block/menril_wall_gate_open.json | 6 +++ .../block/wyrmwood_fence_gate_closed.json | 6 +++ .../block/wyrmwood_fence_gate_open.json | 6 +++ .../block/wyrmwood_wall_gate_closed.json | 6 +++ .../models/block/wyrmwood_wall_gate_open.json | 6 +++ .../models/item/menril_fence.json | 6 +++ .../models/item/menril_fence_gate.json | 6 +++ .../models/item/wyrmwood_fence.json | 6 +++ .../models/item/wyrmwood_fence_gate.json | 6 +++ src/scripts/Events.zs | 4 +- src/scripts/OredictPatches.zs | 6 ++- src/scripts/contentcreator/wood_slabs.zs | 34 +++++++++++--- src/scripts/ct/CoT.zs | 8 +++- src/scripts/ct/Properties.zs | 8 ++-- 24 files changed, 283 insertions(+), 16 deletions(-) create mode 100644 src/resources/contentcreator/blockstates/menril_fence.json create mode 100644 src/resources/contentcreator/blockstates/menril_fence_gate.json rename src/resources/contentcreator/blockstates/{menril_planks_slab.json => menril_slab.json} (100%) rename src/resources/contentcreator/blockstates/{menril_planks_slab_double.json => menril_slab_double.json} (100%) create mode 100644 src/resources/contentcreator/blockstates/wyrmwood_fence.json create mode 100644 src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json create mode 100644 src/resources/contentcreator/models/block/menril_fence_gate_closed.json create mode 100644 src/resources/contentcreator/models/block/menril_fence_gate_open.json create mode 100644 src/resources/contentcreator/models/block/menril_wall_gate_closed.json create mode 100644 src/resources/contentcreator/models/block/menril_wall_gate_open.json create mode 100644 src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json create mode 100644 src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json create mode 100644 src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json create mode 100644 src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json create mode 100644 src/resources/contentcreator/models/item/menril_fence.json create mode 100644 src/resources/contentcreator/models/item/menril_fence_gate.json create mode 100644 src/resources/contentcreator/models/item/wyrmwood_fence.json create mode 100644 src/resources/contentcreator/models/item/wyrmwood_fence_gate.json diff --git a/src/resources/contentcreator/blockstates/menril_fence.json b/src/resources/contentcreator/blockstates/menril_fence.json new file mode 100644 index 00000000..0e6e80b5 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_fence.json @@ -0,0 +1,44 @@ +{ + "forge_marker": 1, + "defaults": { + "transform":"forge:default-block", + "model":"fence_post", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } + }, + "variants": { + "north": { + "true": { + "submodel": { + "side_north": {"model": "fence_side", "uvlock": true} + } + }, + "false": {} + }, + "east": { + "true": { + "submodel": { + "side_east": {"model": "fence_side", "y": 90, "uvlock": true} + } + }, + "false": {} + }, + "south": { + "true": { + "submodel": { + "side_south": {"model": "fence_side", "y": 180, "uvlock": true} + } + }, + "false": {} + }, + "west": { + "true": { + "submodel": { + "side_west": {"model": "fence_side", "y": 270, "uvlock": true} + } + }, + "false": {} + } + } +} diff --git a/src/resources/contentcreator/blockstates/menril_fence_gate.json b/src/resources/contentcreator/blockstates/menril_fence_gate.json new file mode 100644 index 00000000..e12c8506 --- /dev/null +++ b/src/resources/contentcreator/blockstates/menril_fence_gate.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true }, + "facing=south,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true }, + "facing=west,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false,powered=false": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=false,powered=true": { "model": "contentcreator:menril_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true }, + "facing=south,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true,powered=false": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=true,powered=true": { "model": "contentcreator:menril_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true }, + "facing=south,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true }, + "facing=west,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false,powered=false": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=false,powered=true": { "model": "contentcreator:menril_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true }, + "facing=south,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true }, + "facing=west,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true,powered=false": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=true,powered=true": { "model": "contentcreator:menril_wall_gate_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/resources/contentcreator/blockstates/menril_planks_slab.json b/src/resources/contentcreator/blockstates/menril_slab.json similarity index 100% rename from src/resources/contentcreator/blockstates/menril_planks_slab.json rename to src/resources/contentcreator/blockstates/menril_slab.json diff --git a/src/resources/contentcreator/blockstates/menril_planks_slab_double.json b/src/resources/contentcreator/blockstates/menril_slab_double.json similarity index 100% rename from src/resources/contentcreator/blockstates/menril_planks_slab_double.json rename to src/resources/contentcreator/blockstates/menril_slab_double.json diff --git a/src/resources/contentcreator/blockstates/wyrmwood_fence.json b/src/resources/contentcreator/blockstates/wyrmwood_fence.json new file mode 100644 index 00000000..65a9276e --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_fence.json @@ -0,0 +1,44 @@ +{ + "forge_marker": 1, + "defaults": { + "transform":"forge:default-block", + "model":"fence_post", + "textures": { + "texture": "stygian:block/endplanks" + } + }, + "variants": { + "north": { + "true": { + "submodel": { + "side_north": {"model": "fence_side", "uvlock": true} + } + }, + "false": {} + }, + "east": { + "true": { + "submodel": { + "side_east": {"model": "fence_side", "y": 90, "uvlock": true} + } + }, + "false": {} + }, + "south": { + "true": { + "submodel": { + "side_south": {"model": "fence_side", "y": 180, "uvlock": true} + } + }, + "false": {} + }, + "west": { + "true": { + "submodel": { + "side_west": {"model": "fence_side", "y": 270, "uvlock": true} + } + }, + "false": {} + } + } +} diff --git a/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json b/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json new file mode 100644 index 00000000..00f88e8f --- /dev/null +++ b/src/resources/contentcreator/blockstates/wyrmwood_fence_gate.json @@ -0,0 +1,36 @@ +{ + "variants": { + "facing=south,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true }, + "facing=south,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true }, + "facing=west,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=false,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=false,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true }, + "facing=south,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true }, + "facing=west,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=false,open=true,powered=false": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=false,open=true,powered=true": { "model": "contentcreator:wyrmwood_fence_gate_open", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true }, + "facing=south,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true }, + "facing=west,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=false,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=false,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_closed", "uvlock": true, "y": 270 }, + "facing=south,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true }, + "facing=south,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true }, + "facing=west,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=west,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 90 }, + "facing=north,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=north,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 180 }, + "facing=east,in_wall=true,open=true,powered=false": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 270 }, + "facing=east,in_wall=true,open=true,powered=true": { "model": "contentcreator:wyrmwood_wall_gate_open", "uvlock": true, "y": 270 } + } +} diff --git a/src/resources/contentcreator/lang/en_us.lang b/src/resources/contentcreator/lang/en_us.lang index 3f445458..d9e1a349 100644 --- a/src/resources/contentcreator/lang/en_us.lang +++ b/src/resources/contentcreator/lang/en_us.lang @@ -1,6 +1,11 @@ tile.contentcreator.wyrmwood_slab.name=Wyrmwood Slab tile.contentcreator.wyrmwood_stairs.name=Wyrmwood Stairs -tile.contentcreator.menril_planks_slab.name=Menril Wood Slab +tile.contentcreator.wyrmwood_fence.name=Wyrmwood Fence +tile.contentcreator.wyrmwood_fence_gate.name=Wyrmwood Fence Gate + +tile.contentcreator.menril_slab.name=Menril Wood Slab +tile.contentcreator.menril_fence.name=Menril Fence +tile.contentcreator.menril_fence_gate.name=Menril Fence Gate tile.contentcreator.end_stone_brick_slab.name=End Stone Brick Slab tile.contentcreator.end_stone_brick_stairs.name=End Stone Brick Stairs \ No newline at end of file diff --git a/src/resources/contentcreator/models/block/menril_fence_gate_closed.json b/src/resources/contentcreator/models/block/menril_fence_gate_closed.json new file mode 100644 index 00000000..cd739fd7 --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_fence_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_fence_gate_open.json b/src/resources/contentcreator/models/block/menril_fence_gate_open.json new file mode 100644 index 00000000..3ec8857f --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_open", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_wall_gate_closed.json b/src/resources/contentcreator/models/block/menril_wall_gate_closed.json new file mode 100644 index 00000000..c26754cc --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_wall_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/menril_wall_gate_open.json b/src/resources/contentcreator/models/block/menril_wall_gate_open.json new file mode 100644 index 00000000..7859903e --- /dev/null +++ b/src/resources/contentcreator/models/block/menril_wall_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_open", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json new file mode 100644 index 00000000..44c84c35 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json new file mode 100644 index 00000000..e336aac7 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_open", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json new file mode 100644 index 00000000..5caf4a52 --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json new file mode 100644 index 00000000..88c83b5f --- /dev/null +++ b/src/resources/contentcreator/models/block/wyrmwood_wall_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_gate_open", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/item/menril_fence.json b/src/resources/contentcreator/models/item/menril_fence.json new file mode 100644 index 00000000..07d19778 --- /dev/null +++ b/src/resources/contentcreator/models/item/menril_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} diff --git a/src/resources/contentcreator/models/item/menril_fence_gate.json b/src/resources/contentcreator/models/item/menril_fence_gate.json new file mode 100644 index 00000000..9d73c74c --- /dev/null +++ b/src/resources/contentcreator/models/item/menril_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "integrateddynamics:blocks/menril_planks" + } +} \ No newline at end of file diff --git a/src/resources/contentcreator/models/item/wyrmwood_fence.json b/src/resources/contentcreator/models/item/wyrmwood_fence.json new file mode 100644 index 00000000..9d1b79a3 --- /dev/null +++ b/src/resources/contentcreator/models/item/wyrmwood_fence.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_inventory", + "textures": { + "texture": "stygian:block/endplanks" + } +} diff --git a/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json b/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json new file mode 100644 index 00000000..deec153b --- /dev/null +++ b/src/resources/contentcreator/models/item/wyrmwood_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "block/fence_gate_closed", + "textures": { + "texture": "stygian:block/endplanks" + } +} \ No newline at end of file diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 208de572..4912fbaa 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -39,9 +39,9 @@ events.onBlockBreak(function(event as BlockBreakEvent) { for i in 0 .. 2 { event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); } - } else if (event.blockState == ) { + } else if (event.blockState == ) { for i in 0 .. 2 { - event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); + event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); } } else if (event.blockState == ) { for type in event.player.currentItem.toolClasses { diff --git a/src/scripts/OredictPatches.zs b/src/scripts/OredictPatches.zs index f47ab210..0b803baf 100644 --- a/src/scripts/OredictPatches.zs +++ b/src/scripts/OredictPatches.zs @@ -44,5 +44,7 @@ .addItems([]); //New wooden slabs and stairs -.addItems([, ]); -.addItems([]); \ No newline at end of file +.addItems([, ]); +.addItems([]); +.addItems([, ]); +.addItems([, ]); \ No newline at end of file diff --git a/src/scripts/contentcreator/wood_slabs.zs b/src/scripts/contentcreator/wood_slabs.zs index f746f51b..60aa58a5 100644 --- a/src/scripts/contentcreator/wood_slabs.zs +++ b/src/scripts/contentcreator/wood_slabs.zs @@ -13,9 +13,33 @@ wyrmwood_slab.register(); var wyrmwood_stairs = GenericBlock.createStairs("wyrmwood_stairs", ); wyrmwood_stairs.register(); +var wyrmwood_fence = GenericBlock.createFence(IMaterial.wood(), "wyrmwood_fence"); +wyrmwood_fence.setStrength(2.0, 3.0); +wyrmwood_fence.setSoundType(); +wyrmwood_fence.setHarvestLevel("axe", 0); +wyrmwood_fence.register(); + +var wyrmwood_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "wyrmwood_fence_gate"); +wyrmwood_fence_gate.setStrength(2.0, 3.0); +wyrmwood_fence_gate.setSoundType(); +wyrmwood_fence_gate.setHarvestLevel("axe", 0); +wyrmwood_fence_gate.register(); + //Menril wood -var menril_planks_slab = GenericBlock.createSlab(IMaterial.wood(), "menril_planks_slab"); -menril_planks_slab.setStrength(2.0, 3.0); -menril_planks_slab.setSoundType(); -menril_planks_slab.setHarvestLevel("axe", 0); -menril_planks_slab.register(); \ No newline at end of file +var menril_slab = GenericBlock.createSlab(IMaterial.wood(), "menril_slab"); +menril_slab.setStrength(2.0, 3.0); +menril_slab.setSoundType(); +menril_slab.setHarvestLevel("axe", 0); +menril_slab.register(); + +var menril_fence = GenericBlock.createFence(IMaterial.wood(), "menril_fence"); +menril_fence.setStrength(2.0, 3.0); +menril_fence.setSoundType(); +menril_fence.setHarvestLevel("axe", 0); +menril_fence.register(); + +var menril_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "menril_fence_gate"); +menril_fence_gate.setStrength(2.0, 3.0); +menril_fence_gate.setSoundType(); +menril_fence_gate.setHarvestLevel("axe", 0); +menril_fence_gate.register(); \ No newline at end of file diff --git a/src/scripts/ct/CoT.zs b/src/scripts/ct/CoT.zs index 56a1bc7e..15fa6859 100644 --- a/src/scripts/ct/CoT.zs +++ b/src/scripts/ct/CoT.zs @@ -98,9 +98,13 @@ recipes.addShapeless( * 9, [*6, [[, , ]]); recipes.addShapedMirrored(*4, [[, null, null], [, , null], [, , ]]); recipes.addShapeless(, [, ]); +recipes.addShaped(*3, [[, , ], [, , ]]); +recipes.addShaped(, [[, , ], [, , ]]); -recipes.addShaped(*6, [[, , ]]); -recipes.addShapeless(, [, ]); +recipes.addShaped(*6, [[, , ]]); +recipes.addShapeless(, [, ]); +recipes.addShaped(*3, [[, , ], [, , ]]); +recipes.addShaped(, [[, , ], [, , ]]); //End Stone Brick Slabs and Stairs recipes.addShaped(*6, [[, , ]]); diff --git a/src/scripts/ct/Properties.zs b/src/scripts/ct/Properties.zs index b796fbad..b52be9ff 100644 --- a/src/scripts/ct/Properties.zs +++ b/src/scripts/ct/Properties.zs @@ -19,10 +19,10 @@ wyrmwood_slab_double.hardness = 2; wyrmwood_slab_double.resistance = 3; wyrmwood_slab_double.setHarvestLevel("axe", 0); -var menril_planks_slab_double = .block.definition; -menril_planks_slab_double.hardness = 2; -menril_planks_slab_double.resistance = 3; -menril_planks_slab_double.setHarvestLevel("axe", 0); +var menril_slab_double = .block.definition; +menril_slab_double.hardness = 2; +menril_slab_double.resistance = 3; +menril_slab_double.setHarvestLevel("axe", 0); var end_stone_brick_slab_double = .block.definition; end_stone_brick_slab_double.hardness = 1.5; From 29078a5248ab646c08d2b9d16b6d5a9a669911e5 Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Wed, 12 Feb 2025 08:00:09 -0600 Subject: [PATCH 5/8] Update Content Creator and remove double slab scripts since they are no longer needed. --- src/scripts/Events.zs | 31 ++++++------------------------- src/scripts/ct/Properties.zs | 18 +----------------- 2 files changed, 7 insertions(+), 42 deletions(-) diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 4912fbaa..1c5a73aa 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -26,31 +26,12 @@ events.onEnderTeleport(function(event as EnderTeleportEvent) { //Also fixes Wyrmwood and menril double slabs not dropping themselves static blacklist as IItemStack[] = [, , , ] as IItemStack[]; events.onBlockBreak(function(event as BlockBreakEvent) { - if (!event.world.remote && !(event.isPlayer && event.player.creative)) { - if (event.blockState == && event.isPlayer && !extrautilities2.Tweaker.XUTweaker.isPlayerFake(event.player)) { - var item = event.player.currentItem; - if (isNull(item) || (!item.canHarvestBlock() && !(blacklist has item.definition.makeStack()))) { - var r = Math.random() * 2 + 2; - for i in 0 to r { - event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); - } - } - } else if (event.blockState == ) { - for i in 0 .. 2 { - event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); - } - } else if (event.blockState == ) { - for i in 0 .. 2 { - event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); - } - } else if (event.blockState == ) { - for type in event.player.currentItem.toolClasses { - if(event.block.definition.isToolEffective(type, event.blockState)) { - for i in 0 .. 2 { - event.world.spawnEntity(.createEntityItem(event.world, event.x, event.y, event.z)); - } - return; - } + if (!event.world.remote && event.blockState == && event.isPlayer && !extrautilities2.Tweaker.XUTweaker.isPlayerFake(event.player) && event.player.creative == false) { + var item = event.player.currentItem; + if (isNull(item) || (!item.canHarvestBlock() && !(blacklist has item.definition.makeStack()))) { + var r = Math.random() * 2 + 2; + for i in 0 to r { + event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); } } } diff --git a/src/scripts/ct/Properties.zs b/src/scripts/ct/Properties.zs index b52be9ff..28252c7f 100644 --- a/src/scripts/ct/Properties.zs +++ b/src/scripts/ct/Properties.zs @@ -11,20 +11,4 @@ endstone.hardness = 1.5; //Portals are now unbreakable var portal = .block.definition; -portal.hardness = -1; - -//ContentCreator doesn't set double slab properties correctly. So we have to set them here -var wyrmwood_slab_double = .block.definition; -wyrmwood_slab_double.hardness = 2; -wyrmwood_slab_double.resistance = 3; -wyrmwood_slab_double.setHarvestLevel("axe", 0); - -var menril_slab_double = .block.definition; -menril_slab_double.hardness = 2; -menril_slab_double.resistance = 3; -menril_slab_double.setHarvestLevel("axe", 0); - -var end_stone_brick_slab_double = .block.definition; -end_stone_brick_slab_double.hardness = 1.5; -end_stone_brick_slab_double.resistance = 9; -end_stone_brick_slab_double.setHarvestLevel("pickaxe", 0); \ No newline at end of file +portal.hardness = -1; \ No newline at end of file From c01cd445708bde69713c5f7baf3986a6671f724e Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:26:41 -0600 Subject: [PATCH 6/8] fix whitespace error --- src/scripts/Events.zs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/Events.zs b/src/scripts/Events.zs index 1c5a73aa..eec5cf3d 100644 --- a/src/scripts/Events.zs +++ b/src/scripts/Events.zs @@ -32,7 +32,7 @@ events.onBlockBreak(function(event as BlockBreakEvent) { var r = Math.random() * 2 + 2; for i in 0 to r { event.world.spawnEntity(.withTag({Material: "endstone"}).createEntityItem(event.world, event.x, event.y, event.z)); - } + } } } }); From ae4acb26de8717395ca0290bae2b1fe90503c1cd Mon Sep 17 00:00:00 2001 From: YouQi_ovo <91328191+YouQi-0v0@users.noreply.github.com> Date: Thu, 10 Apr 2025 17:01:14 +0800 Subject: [PATCH 7/8] Add Simplified Chinese Localization (zh_cn.json) --- src/resources/contentcreator/lang/zh_cn.lang | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/resources/contentcreator/lang/zh_cn.lang diff --git a/src/resources/contentcreator/lang/zh_cn.lang b/src/resources/contentcreator/lang/zh_cn.lang new file mode 100644 index 00000000..cf93d88d --- /dev/null +++ b/src/resources/contentcreator/lang/zh_cn.lang @@ -0,0 +1,11 @@ +tile.contentcreator.wyrmwood_slab.name=龙木台阶 +tile.contentcreator.wyrmwood_stairs.name=龙木楼梯 +tile.contentcreator.wyrmwood_fence.name=龙木栅栏 +tile.contentcreator.wyrmwood_fence_gate.name=龙木栅栏门 + +tile.contentcreator.menril_slab.name=门瑞欧木台阶 +tile.contentcreator.menril_fence.name=门瑞欧木栅栏 +tile.contentcreator.menril_fence_gate.name=门瑞欧木栅栏门 + +tile.contentcreator.end_stone_brick_slab.name=末地石砖台阶 +tile.contentcreator.end_stone_brick_stairs.name=末地石砖楼梯 \ No newline at end of file From 2e4181386cc0f874ebccf3513354803ff01d8ea5 Mon Sep 17 00:00:00 2001 From: CubeBotFan <150861277+cubebotfan@users.noreply.github.com> Date: Tue, 6 May 2025 14:50:41 -0500 Subject: [PATCH 8/8] Fix crafttweaker syntax errors to do with soundtypes --- src/scripts/contentcreator/end_stone_bricks.zs | 5 +++-- src/scripts/contentcreator/wood_slabs.zs | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/scripts/contentcreator/end_stone_bricks.zs b/src/scripts/contentcreator/end_stone_bricks.zs index 5ef8f906..e4bd8c91 100644 --- a/src/scripts/contentcreator/end_stone_bricks.zs +++ b/src/scripts/contentcreator/end_stone_bricks.zs @@ -2,16 +2,17 @@ import mods.contenttweaker.VanillaFactory; import contentcreator.block.GenericBlock; import crafttweaker.block.IMaterial; +import contentcreator.block.SoundType; //Wyrmwood var end_stone_brick_slab = GenericBlock.createSlab(IMaterial.rock(), "end_stone_brick_slab"); end_stone_brick_slab.setStrength(1.5, 9.0); -end_stone_brick_slab.setSoundType(); +end_stone_brick_slab.setSoundType(SoundType.get("stone")); end_stone_brick_slab.setHarvestLevel("pickaxe", 0); end_stone_brick_slab.register(); var end_stone_brick_stairs = GenericBlock.createStairs("end_stone_brick_stairs", ); end_stone_brick_stairs.setStrength(1.5, 9.0); -end_stone_brick_stairs.setSoundType(); +end_stone_brick_stairs.setSoundType(SoundType.get("stone")); end_stone_brick_stairs.setHarvestLevel("pickaxe", 0); end_stone_brick_stairs.register(); \ No newline at end of file diff --git a/src/scripts/contentcreator/wood_slabs.zs b/src/scripts/contentcreator/wood_slabs.zs index 60aa58a5..8355ebf2 100644 --- a/src/scripts/contentcreator/wood_slabs.zs +++ b/src/scripts/contentcreator/wood_slabs.zs @@ -2,11 +2,12 @@ import mods.contenttweaker.VanillaFactory; import contentcreator.block.GenericBlock; import crafttweaker.block.IMaterial; +import contentcreator.block.SoundType; //Wyrmwood var wyrmwood_slab = GenericBlock.createSlab(IMaterial.wood(), "wyrmwood_slab"); wyrmwood_slab.setStrength(2.0, 3.0); -wyrmwood_slab.setSoundType(); +wyrmwood_slab.setSoundType(SoundType.get("wood")); wyrmwood_slab.setHarvestLevel("axe", 0); wyrmwood_slab.register(); @@ -15,31 +16,31 @@ wyrmwood_stairs.register(); var wyrmwood_fence = GenericBlock.createFence(IMaterial.wood(), "wyrmwood_fence"); wyrmwood_fence.setStrength(2.0, 3.0); -wyrmwood_fence.setSoundType(); +wyrmwood_fence.setSoundType(SoundType.get("wood")); wyrmwood_fence.setHarvestLevel("axe", 0); wyrmwood_fence.register(); var wyrmwood_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "wyrmwood_fence_gate"); wyrmwood_fence_gate.setStrength(2.0, 3.0); -wyrmwood_fence_gate.setSoundType(); +wyrmwood_fence_gate.setSoundType(SoundType.get("wood")); wyrmwood_fence_gate.setHarvestLevel("axe", 0); wyrmwood_fence_gate.register(); //Menril wood var menril_slab = GenericBlock.createSlab(IMaterial.wood(), "menril_slab"); menril_slab.setStrength(2.0, 3.0); -menril_slab.setSoundType(); +menril_slab.setSoundType(SoundType.get("wood")); menril_slab.setHarvestLevel("axe", 0); menril_slab.register(); var menril_fence = GenericBlock.createFence(IMaterial.wood(), "menril_fence"); menril_fence.setStrength(2.0, 3.0); -menril_fence.setSoundType(); +menril_fence.setSoundType(SoundType.get("wood")); menril_fence.setHarvestLevel("axe", 0); menril_fence.register(); var menril_fence_gate = GenericBlock.createFenceGate(IMaterial.wood(), "menril_fence_gate"); menril_fence_gate.setStrength(2.0, 3.0); -menril_fence_gate.setSoundType(); +menril_fence_gate.setSoundType(SoundType.get("wood")); menril_fence_gate.setHarvestLevel("axe", 0); menril_fence_gate.register(); \ No newline at end of file