Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add mangrove tables (1.1.2), make azalea and jacaranda mineable. #33

Merged
merged 7 commits into from
May 28, 2023
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
org.gradle.parallel = true

# Mod Properties
version = 1.1.1+1.19
version = 1.1.3+1.19
maven_group = io.github.woodiertexas
archives_base_name = architecture_extensions

Expand Down
5 changes: 3 additions & 2 deletions python_scripts/anApiThingy.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

# Aurora's Deco Blocks
"azalea_beam", "jacaranda_beam", "azalea_fence_post", "jacaranda_fence_post", "azalea_joist", "jacaranda_joist",
"azalea_crown_molding", "jacaranda_crown_molding"
"azalea_crown_molding", "jacaranda_crown_molding", "azalea_post_cap", "azalea_post_lantern", "jacaranda_post_cap", "jacaranda_post_lantern",
]

block_names = [
Expand Down Expand Up @@ -124,7 +124,8 @@

# Aurora's Deco Blocks
"Azalea Beam", "Jacaranda Beam", "Azalea Fence Post", "Jacaranda Fence Post", "Azalea Joist", "Jacaranda Joist",
"Azalea Crown Molding", "Jacaranda Crown Molding"
"Azalea Crown Molding", "Jacaranda Crown Molding", "Azalea Post Cap", "Azalea Post Lantern",
"Jacaranda Post Cap", "Jacaranda Post Lantern",
]


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import io.github.woodiertexas.architecture_extensions.blocks.FencePostBlock;
import io.github.woodiertexas.architecture_extensions.blocks.JoistBlock;
import io.github.woodiertexas.architecture_extensions.blocks.MoldingBlock;
import io.github.woodiertexas.architecture_extensions.blocks.PostCapBlock;
import io.github.woodiertexas.architecture_extensions.blocks.PostLanternBlock;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.Material;
Expand All @@ -30,13 +32,19 @@ public class ArchExAurorasDecoCompat {
// Joist Blocks
public static final JoistBlock AZALEA_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
public static final JoistBlock JACARANDA_JOIST = new JoistBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());

// Molding Blocks
public static final MoldingBlock AZALEA_CROWN_MOLDING = new MoldingBlock(Blocks.ACACIA_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
public static final MoldingBlock JACARANDA_CROWN_MOLDING = new MoldingBlock(Blocks.ACACIA_PLANKS.getDefaultState(), QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());

// Fence Post Caps and Lanterns
public static final PostCapBlock AZALEA_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
public static final PostLanternBlock AZALEA_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());
public static final PostCapBlock JACARANDA_POST_CAP = new PostCapBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).requiresTool());
public static final PostLanternBlock JACARANDA_POST_LANTERN = new PostLanternBlock(QuiltBlockSettings.of(Material.WOOD).strength(1.5f).sounds(BlockSoundGroup.WOOD).luminance(15).requiresTool());


static {
static {
/*
List of blocks to be registered in key, value pairs.
For example, "cobblestone_column, COBBLESTONE_COLUMN"
Expand All @@ -50,6 +58,10 @@ public class ArchExAurorasDecoCompat {
blocks.put("jacaranda_joist", JACARANDA_JOIST);
blocks.put("azalea_crown_molding", AZALEA_CROWN_MOLDING);
blocks.put("jacaranda_crown_molding", JACARANDA_CROWN_MOLDING);
blocks.put("azalea_post_cap", AZALEA_POST_CAP);
blocks.put("azalea_post_lantern", AZALEA_POST_LANTERN);
blocks.put("jacaranda_post_cap", JACARANDA_POST_CAP);
blocks.put("jacaranda_post_lantern", JACARANDA_POST_LANTERN);

// Registering the blocks and corresponding block items.
for (Map.Entry<String, Block> entry : blocks.entrySet()) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "architecture_extensions:block/post_caps/azalea_post_cap"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "architecture_extensions:block/post_caps/azalea_post_lantern"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "architecture_extensions:block/post_caps/jacaranda_post_cap"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "architecture_extensions:block/post_caps/jacaranda_post_lantern"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,9 @@
"block.architecture_extensions.azalea_joist": "Azalea Joist",
"block.architecture_extensions.jacaranda_joist": "Jacaranda Joist",
"block.architecture_extensions.azalea_crown_molding": "Azalea Crown Molding",
"block.architecture_extensions.jacaranda_crown_molding": "Jacaranda Crown Molding"
}
"block.architecture_extensions.jacaranda_crown_molding": "Jacaranda Crown Molding",
"block.architecture_extensions.azalea_post_cap": "Azalea Post Cap",
"block.architecture_extensions.azalea_post_lantern": "Azalea Post Lantern",
"block.architecture_extensions.jacaranda_post_cap": "Jacaranda Post Cap",
"block.architecture_extensions.jacaranda_post_lantern": "Jacaranda Post Lantern"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "architecture_extensions:block/templates/template_post_cap",
"textures": {
"texture": "aurorasdeco:block/azalea_planks"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "architecture_extensions:block/templates/template_post_lantern",
"textures": {
"wood_texture": "aurorasdeco:block/azalea_planks",
"lantern_texture": "aurorasdeco:block/amethyst_lantern"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "architecture_extensions:block/templates/template_post_cap",
"textures": {
"texture": "aurorasdeco:block/jacaranda_planks"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "architecture_extensions:block/templates/template_post_lantern",
"textures": {
"wood_texture": "aurorasdeco:block/jacaranda_planks",
"lantern_texture": "aurorasdeco:block/amethyst_lantern"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "architecture_extensions:block/post_caps/azalea_post_cap"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "architecture_extensions:block/post_caps/azalea_post_lantern"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "architecture_extensions:block/post_caps/jacaranda_post_cap"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "architecture_extensions:block/post_caps/jacaranda_post_lantern"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:azalea_post_cap"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:azalea_post_lantern"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:jacaranda_post_cap"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:jacaranda_post_lantern"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_beam"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_crown_molding"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_fence_post"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_joist"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_post_cap"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "architecture_extensions:mangrove_post_lantern"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"fabric:load_conditions": [
{
"condition": "fabric:all_mods_loaded",
"values": [
"aurorasdeco"
]
}
],
"type": "minecraft:stonecutting",
"ingredient": {
"item": "aurorasdeco:azalea_planks"
},
"result": "architecture_extensions:azalea_post_cap",
"count": 8
}
Loading