diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java index f75287f..8ebeb4d 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -11,6 +11,7 @@ public class AcesBSClient implements ClientModInitializer { public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_DOOR, RenderLayer.getTranslucent()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_TRAPDOOR, RenderLayer.getTranslucent()); + BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.TOBACCO_CROP, RenderLayer.getCutout()); ModModelPredicates.registerModelPredicates(); } diff --git a/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java b/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java index f8b7451..b78a173 100644 --- a/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java +++ b/src/main/java/com/acethewildfire/acesbs/enchantment/custom/LightningStrikeEnchantmentEffect.java @@ -20,8 +20,8 @@ public record LightningStrikeEnchantmentEffect() implements EnchantmentEntityEff EntityType.LIGHTNING_BOLT.spawn(world, user.getBlockPos(), SpawnReason.TRIGGERED); } if(level == 2){ - EntityType.LIGHTNING_BOLT.spawn(world, user.getBlockPos(), SpawnReason.TRIGGERED); - EntityType.LIGHTNING_BOLT.spawn(world, user.getBlockPos(), SpawnReason.TRIGGERED); + EntityType.LIGHTNING_BOLT.spawn(world, new BlockPos(((int) pos.x),((int) pos.y),((int) pos.z)), SpawnReason.TRIGGERED); + EntityType.LIGHTNING_BOLT.spawn(world, new BlockPos(((int) pos.x),((int) pos.y),((int) pos.z)), SpawnReason.TRIGGERED); } } diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index e4a8355..6681743 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -47,10 +47,14 @@ "painting.acesbs.herald.author": "AceTheWildfire", "painting.acesbs.fire.title": "Neon Wildfire", "painting.acesbs.fire.author": "AceTheWildfire", + "painting.acesbs.writings.title": "Writings on the Wall", + "painting.acesbs.writings.author": "AceTheWildfire", "painting.acesbs.stained.title": "Temple of Love", "painting.acesbs.stained.author": "Sovaeris", "painting.acesbs.soul_flame.title": "White Soul Flame", "painting.acesbs.soul_flame.author": "Sovaeris", + "painting.acesbs.nebula.title": "Nebula", + "painting.acesbs.nebula.author": "Sovaeris", "trim_material.acesbs.prisma_steel": "Prisma Steel Material", "trim_pattern.acesbs.prisma": "Prisma Armor Pattern", diff --git a/src/main/resources/assets/acesbs/textures/painting/nebula.png b/src/main/resources/assets/acesbs/textures/painting/nebula.png new file mode 100644 index 0000000..df60f78 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/painting/nebula.png differ diff --git a/src/main/resources/assets/acesbs/textures/painting/writings.png b/src/main/resources/assets/acesbs/textures/painting/writings.png new file mode 100644 index 0000000..83336ab Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/painting/writings.png differ diff --git a/src/main/resources/data/acesbs/painting_variant/nebula.json b/src/main/resources/data/acesbs/painting_variant/nebula.json new file mode 100644 index 0000000..a8302cc --- /dev/null +++ b/src/main/resources/data/acesbs/painting_variant/nebula.json @@ -0,0 +1,5 @@ +{ + "asset_id": "acesbs:nebula", + "height": 10, + "width": 14 +} \ No newline at end of file diff --git a/src/main/resources/data/acesbs/painting_variant/writings.json b/src/main/resources/data/acesbs/painting_variant/writings.json new file mode 100644 index 0000000..bb136f5 --- /dev/null +++ b/src/main/resources/data/acesbs/painting_variant/writings.json @@ -0,0 +1,5 @@ +{ + "asset_id": "acesbs:writings", + "height": 5, + "width": 8 +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json index 811fa1d..bae1c3c 100644 --- a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -2,7 +2,9 @@ "values": [ "acesbs:herald", "acesbs:fire", + "acesbs:writings", "acesbs:soul_flame", + "acesbs:nebula", "acesbs:stained" ] } \ No newline at end of file