diff --git a/src/main/java/net/halbear/aotg/registries/ModBlocks.java b/src/main/java/net/halbear/aotg/registries/ModBlocks.java index 5a4b17f..3880432 100644 --- a/src/main/java/net/halbear/aotg/registries/ModBlocks.java +++ b/src/main/java/net/halbear/aotg/registries/ModBlocks.java @@ -5,10 +5,10 @@ import net.halbear.aotg.custom.blocks.AlloyFurnace.AlloyFurnaceMultiBlock; import net.halbear.aotg.custom.blocks.Forge.ForgeWorkbench; import net.halbear.aotg.custom.blocks.RockCoveredGrassBlock; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.properties.BlockSetType; +import net.minecraft.world.level.block.state.properties.WoodType; import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredRegister; @@ -83,6 +83,33 @@ public class ModBlocks { .lightLevel(state -> 0) )); + public static final DeferredBlock OLIVE_BUTTON = RegisterBlock("olive_button", + properties -> new ButtonBlock(BlockSetType.JUNGLE,160,properties.strength(0.5f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); + + public static final DeferredBlock OLIVE_PRESSURE_PLATE = RegisterBlock("olive_pressure_plate", + properties -> new PressurePlateBlock(BlockSetType.JUNGLE,properties.strength(0.5f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); + + public static final DeferredBlock OLIVE_FENCE_GATE = RegisterBlock("olive_fence_gate", + properties -> new FenceGateBlock(WoodType.JUNGLE,properties.strength(0.5f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); + + public static final DeferredBlock OLIVE_FENCE = RegisterBlock("olive_fence", + properties -> new FenceBlock(properties.strength(0.5f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); public static final DeferredBlock OLIVE_LEAVES = RegisterBlock("olive_leaves", properties -> new Block(properties.strength(0.15f) @@ -98,6 +125,18 @@ public class ModBlocks { .sound(SoundType.WOOD) .lightLevel(state -> 0) )); + public static final DeferredBlock OLIVE_STAIRS = RegisterBlock("olive_stairs", + properties -> new StairBlock(ModBlocks.OLIVE_PLANKS.get().defaultBlockState(),properties.strength(0.35f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); + public static final DeferredBlock OLIVE_SLAB = RegisterBlock("olive_slab", + properties -> new SlabBlock(properties.strength(0.35f) + .explosionResistance(1.0f) + .sound(SoundType.WOOD) + .lightLevel(state -> 0) + )); public static final DeferredBlock SHALE_BLOCK = RegisterBlock("shale_block", properties -> new RockCoveredGrassBlock(properties.strength(1.5f) diff --git a/src/main/java/net/halbear/aotg/registries/ModItems.java b/src/main/java/net/halbear/aotg/registries/ModItems.java index b1f50cb..9728e2d 100644 --- a/src/main/java/net/halbear/aotg/registries/ModItems.java +++ b/src/main/java/net/halbear/aotg/registries/ModItems.java @@ -28,9 +28,15 @@ public class ModItems { public static final DeferredItem LIMESTONE_GRASS_ITEM = ITEMS.registerSimpleBlockItem("limestone_grass_block", LIMESTONE_GRASS_BLOCK); public static final DeferredItem OLIVE_LEAVES_ITEM = ITEMS.registerSimpleBlockItem("olive_leaves", OLIVE_LEAVES); public static final DeferredItem OLIVE_LOG_ITEM = ITEMS.registerSimpleBlockItem("olive_log", OLIVE_LOG); + public static final DeferredItem OLIVE_FENCE_ITEM = ITEMS.registerSimpleBlockItem("olive_fence", OLIVE_FENCE); + public static final DeferredItem OLIVE_FENCE_GATE_ITEM = ITEMS.registerSimpleBlockItem("olive_fence_gate", OLIVE_FENCE_GATE); + public static final DeferredItem OLIVE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem("olive_stairs", OLIVE_STAIRS); public static final DeferredItem ALLOY_FURNACE_ITEM = ITEMS.registerSimpleBlockItem("alloy_furnace", ALLOY_FURNACE); public static final DeferredItem FORGE_WORKBENCH_ITEM = ITEMS.registerSimpleBlockItem("forge", FORGE_WORKBENCH); public static final DeferredItem OLIVE_PLANKS_ITEM = ITEMS.registerSimpleBlockItem("olive_planks", OLIVE_PLANKS); + public static final DeferredItem OLIVE_SLAB_ITEM = ITEMS.registerSimpleBlockItem("olive_slab", OLIVE_SLAB); + public static final DeferredItem OLIVE_BUTTON_ITEM = ITEMS.registerSimpleBlockItem("olive_button", OLIVE_BUTTON); + public static final DeferredItem OLIVE_PRESSURE_PLATE_ITEM = ITEMS.registerSimpleBlockItem("olive_pressure_plate", OLIVE_PRESSURE_PLATE); public static final DeferredItem FLUID_INDICATOR_ITEM = RegisterItem("fluid_indicator_debug_item", properties -> new Item(properties .fireResistant() diff --git a/src/main/java/net/halbear/aotg/registries/ModTabs.java b/src/main/java/net/halbear/aotg/registries/ModTabs.java index 001d0eb..103f132 100644 --- a/src/main/java/net/halbear/aotg/registries/ModTabs.java +++ b/src/main/java/net/halbear/aotg/registries/ModTabs.java @@ -39,6 +39,12 @@ public class ModTabs { output.accept(LIMESTONE_GRASS_ITEM.get()); output.accept(OLIVE_LEAVES_ITEM.get()); output.accept(OLIVE_LOG_ITEM.get()); + output.accept(OLIVE_FENCE_GATE_ITEM.get()); + output.accept(OLIVE_FENCE_ITEM.get()); + output.accept(OLIVE_STAIRS_ITEM.get()); + output.accept(OLIVE_SLAB_ITEM.get()); + output.accept(OLIVE_BUTTON_ITEM.get()); + output.accept(OLIVE_PRESSURE_PLATE_ITEM.get()); output.accept(ALLOY_FURNACE_ITEM.get()); output.accept(FORGE_WORKBENCH_ITEM.get()); output.accept(TIN_ORE_ITEM.get()); diff --git a/src/main/resources/assets/ageofthegods/Items/olive_button.json b/src/main/resources/assets/ageofthegods/Items/olive_button.json new file mode 100644 index 0000000..c868ec7 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_button" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/olive_fence.json b/src/main/resources/assets/ageofthegods/Items/olive_fence.json new file mode 100644 index 0000000..cab91ca --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_fence.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_fence_inventory" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/olive_fence_gate.json b/src/main/resources/assets/ageofthegods/Items/olive_fence_gate.json new file mode 100644 index 0000000..8b5d43d --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_fence_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_fence_gate_inventory" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/olive_pressure_plate.json b/src/main/resources/assets/ageofthegods/Items/olive_pressure_plate.json new file mode 100644 index 0000000..c8a4cc4 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/olive_slab.json b/src/main/resources/assets/ageofthegods/Items/olive_slab.json new file mode 100644 index 0000000..dc98afa --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_slab" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/Items/olive_stairs.json b/src/main/resources/assets/ageofthegods/Items/olive_stairs.json new file mode 100644 index 0000000..b8ce178 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/Items/olive_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "ageofthegods:block/olive/olive_stairs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_button.json b/src/main/resources/assets/ageofthegods/blockstates/olive_button.json new file mode 100644 index 0000000..d094d75 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_button.json @@ -0,0 +1,30 @@ +{ + "variants": { + "face=floor,facing=north,powered=false": { "model": "ageofthegods:block/olive/olive_button", "y": 180 }, + "face=floor,facing=east,powered=false": { "model": "ageofthegods:block/olive/olive_button", "y": 270 }, + "face=floor,facing=south,powered=false": { "model": "ageofthegods:block/olive/olive_button" }, + "face=floor,facing=west,powered=false": { "model": "ageofthegods:block/olive/olive_button", "y": 90 }, + "face=floor,facing=north,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "y": 180 }, + "face=floor,facing=east,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "y": 270 }, + "face=floor,facing=south,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed" }, + "face=floor,facing=west,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "y": 90 }, + + "face=wall,facing=north,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 90 }, + "face=wall,facing=east,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 90, "y": 90 }, + "face=wall,facing=south,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 90, "y": 180 }, + "face=wall,facing=west,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 90, "y": 270 }, + "face=wall,facing=north,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 90 }, + "face=wall,facing=east,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 90, "y": 90 }, + "face=wall,facing=south,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 90, "y": 180 }, + "face=wall,facing=west,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 90, "y": 270 }, + + "face=ceiling,facing=north,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 180, "y": 180 }, + "face=ceiling,facing=east,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 180, "y": 270 }, + "face=ceiling,facing=south,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 180 }, + "face=ceiling,facing=west,powered=false": { "model": "ageofthegods:block/olive/olive_button", "x": 180, "y": 90 }, + "face=ceiling,facing=north,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 180, "y": 180 }, + "face=ceiling,facing=east,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 180, "y": 270 }, + "face=ceiling,facing=south,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 180 }, + "face=ceiling,facing=west,powered=true": { "model": "ageofthegods:block/olive/olive_button_pressed", "x": 180, "y": 90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_fence.json b/src/main/resources/assets/ageofthegods/blockstates/olive_fence.json new file mode 100644 index 0000000..a5a8330 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_fence.json @@ -0,0 +1,23 @@ +{ + "multipart": [ + { + "apply": { "model": "ageofthegods:block/olive/olive_fence_post" } + }, + { + "when": { "north": "true" }, + "apply": { "model": "ageofthegods:block/olive/olive_fence_side", "uvlock": true } + }, + { + "when": { "east": "true" }, + "apply": { "model": "ageofthegods:block/olive/olive_fence_side", "y": 90, "uvlock": true } + }, + { + "when": { "south": "true" }, + "apply": { "model": "ageofthegods:block/olive/olive_fence_side", "y": 180, "uvlock": true } + }, + { + "when": { "west": "true" }, + "apply": { "model": "ageofthegods:block/olive/olive_fence_side", "y": 270, "uvlock": true } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_fence_gate.json b/src/main/resources/assets/ageofthegods/blockstates/olive_fence_gate.json new file mode 100644 index 0000000..6108c91 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_fence_gate.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_closed" }, + "facing=south,in_wall=false,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_closed", "y": 180 }, + "facing=west,in_wall=false,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_closed", "y": 270 }, + "facing=east,in_wall=false,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_closed", "y": 90 }, + "facing=north,in_wall=false,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_open" }, + "facing=south,in_wall=false,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_open", "y": 180 }, + "facing=west,in_wall=false,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_open", "y": 270 }, + "facing=east,in_wall=false,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_open", "y": 90 }, + "facing=north,in_wall=true,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_wall" }, + "facing=south,in_wall=true,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_wall", "y": 180 }, + "facing=west,in_wall=true,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_wall", "y": 270 }, + "facing=east,in_wall=true,open=false": { "model": "ageofthegods:block/olive/olive_fence_gate_wall", "y": 90 }, + "facing=north,in_wall=true,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_wall_open" }, + "facing=south,in_wall=true,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_wall_open", "y": 180 }, + "facing=west,in_wall=true,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_wall_open", "y": 270 }, + "facing=east,in_wall=true,open=true": { "model": "ageofthegods:block/olive/olive_fence_gate_wall_open", "y": 90 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_pressure_plate.json b/src/main/resources/assets/ageofthegods/blockstates/olive_pressure_plate.json new file mode 100644 index 0000000..8db84a7 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "variants": { + "powered=false": { "model": "ageofthegods:block/olive/olive_pressure_plate" }, + "powered=true": { "model": "ageofthegods:block/olive/olive_pressure_plate_down" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_slab.json b/src/main/resources/assets/ageofthegods/blockstates/olive_slab.json new file mode 100644 index 0000000..c84d48b --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "ageofthegods:block/olive/olive_slab" + }, + "type=double": { + "model": "ageofthegods:block/olive/olive_planks" + }, + "type=top": { + "model": "ageofthegods:block/olive/olive_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/blockstates/olive_stairs.json b/src/main/resources/assets/ageofthegods/blockstates/olive_stairs.json new file mode 100644 index 0000000..83841b3 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/blockstates/olive_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 0, "uvlock": true }, + "facing=north,half=bottom,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 0, "uvlock": true }, + "facing=north,half=bottom,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 0, "uvlock": true }, + "facing=west,half=bottom,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "x": 180, "y": 0, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "ageofthegods:block/olive/olive_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 0, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "ageofthegods:block/olive/olive_stairs_outer", "x": 180, "y": 0, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 0, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "ageofthegods:block/olive/olive_stairs_inner", "x": 180, "y": 0, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/lang/en_us.json b/src/main/resources/assets/ageofthegods/lang/en_us.json index 6dfb1fd..c8ceb4b 100644 --- a/src/main/resources/assets/ageofthegods/lang/en_us.json +++ b/src/main/resources/assets/ageofthegods/lang/en_us.json @@ -8,6 +8,12 @@ "block.ageofthegods.olive_leaves": "Olive Leaves", "block.ageofthegods.olive_log": "Olive Log", "block.ageofthegods.olive_planks": "Olive Planks", + "block.ageofthegods.olive_fence": "Olive Fence", + "block.ageofthegods.olive_stairs": "Olive Stairs", + "block.ageofthegods.olive_slab": "Olive Slab", + "block.ageofthegods.olive_button": "Olive Button", + "block.ageofthegods.olive_pressure_plate": "Olive Pressure Plate", + "block.ageofthegods.olive_fence_gate": "Olive Fence Gate", "block.ageofthegods.alloy_furnace": "Alloy Furnace Segment", "block.ageofthegods.forge": "Forge", "block.ageofthegods.silver_ore": "Silver Ore", diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_button.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_button.json new file mode 100644 index 0000000..69fcfda --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_button_pressed.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_button_pressed.json new file mode 100644 index 0000000..2ae937f --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_closed.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_closed.json new file mode 100644 index 0000000..fed0f0e --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_closed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_inventory.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_inventory.json new file mode 100644 index 0000000..0fb2fac --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_inventory", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_open.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_open.json new file mode 100644 index 0000000..97c9d2b --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall.json new file mode 100644 index 0000000..4c027da --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall_open.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall_open.json new file mode 100644 index 0000000..734f0c9 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_inventory.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_inventory.json new file mode 100644 index 0000000..5d19b3c --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_post.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_post.json new file mode 100644 index 0000000..5a38f77 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_side.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_side.json new file mode 100644 index 0000000..7572eb3 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate.json new file mode 100644 index 0000000..04cd04c --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate_down.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate_down.json new file mode 100644 index 0000000..26de0b6 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab.json new file mode 100644 index 0000000..ef28d1a --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "ageofthegods:block/olive/olive_planks", + "top": "ageofthegods:block/olive/olive_planks", + "side": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab_top.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab_top.json new file mode 100644 index 0000000..351c7e0 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "ageofthegods:block/olive/olive_planks", + "top": "ageofthegods:block/olive/olive_planks", + "side": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs.json new file mode 100644 index 0000000..5d4b8c9 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "ageofthegods:block/olive/olive_planks", + "top": "ageofthegods:block/olive/olive_planks", + "side": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_inner.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_inner.json new file mode 100644 index 0000000..47f7a95 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "ageofthegods:block/olive/olive_planks", + "top": "ageofthegods:block/olive/olive_planks", + "side": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_outer.json b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_outer.json new file mode 100644 index 0000000..2540242 --- /dev/null +++ b/src/main/resources/assets/ageofthegods/models/block/olive/olive_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "ageofthegods:block/olive/olive_planks", + "top": "ageofthegods:block/olive/olive_planks", + "side": "ageofthegods:block/olive/olive_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_button.json b/src/main/resources/data/ageofthegods/recipe/olive_button.json new file mode 100644 index 0000000..5a2c9b1 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_button.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "equipment", + "ingredients": [ + "ageofthegods:olive_planks" + ], + "result": { + "id": "ageofthegods:olive_button", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_fence1.json b/src/main/resources/data/ageofthegods/recipe/olive_fence1.json new file mode 100644 index 0000000..8493802 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_fence1.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + "aba", + "aba" + ], + "key": { + "a": "ageofthegods:olive_planks", + "b": "minecraft:stick" + }, + "result": { + "id": "ageofthegods:olive_fence", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_fence2.json b/src/main/resources/data/ageofthegods/recipe/olive_fence2.json new file mode 100644 index 0000000..a2de6cb --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_fence2.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aba", + "aba", + " " + ], + "key": { + "a": "ageofthegods:olive_planks", + "b": "minecraft:stick" + }, + "result": { + "id": "ageofthegods:olive_fence", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_fence_gate1.json b/src/main/resources/data/ageofthegods/recipe/olive_fence_gate1.json new file mode 100644 index 0000000..afce3ab --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_fence_gate1.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "bab", + "bab", + " " + ], + "key": { + "a": "ageofthegods:olive_planks", + "b": "minecraft:stick" + }, + "result": { + "id": "ageofthegods:olive_fence_gate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_fence_gate2.json b/src/main/resources/data/ageofthegods/recipe/olive_fence_gate2.json new file mode 100644 index 0000000..cda8e4a --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_fence_gate2.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + "bab", + "bab" + ], + "key": { + "a": "ageofthegods:olive_planks", + "b": "minecraft:stick" + }, + "result": { + "id": "ageofthegods:olive_fence_gate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate1.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate1.json new file mode 100644 index 0000000..40e6287 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate1.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + " ", + "aa " + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate2.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate2.json new file mode 100644 index 0000000..dbf3dce --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate2.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + "aa ", + " " + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate3.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate3.json new file mode 100644 index 0000000..9e27f35 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate3.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aa ", + " ", + " " + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate4.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate4.json new file mode 100644 index 0000000..7009948 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate4.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + " ", + " aa" + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate5.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate5.json new file mode 100644 index 0000000..8f55268 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate5.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " ", + " aa", + " " + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate6.json b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate6.json new file mode 100644 index 0000000..ad039e8 --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_pressure_plate6.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " aa", + " ", + " " + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_pressure_plate", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_stairs1.json b/src/main/resources/data/ageofthegods/recipe/olive_stairs1.json new file mode 100644 index 0000000..862589e --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_stairs1.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + " a", + " aa", + "aaa" + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/ageofthegods/recipe/olive_stairs2.json b/src/main/resources/data/ageofthegods/recipe/olive_stairs2.json new file mode 100644 index 0000000..f7d4f5c --- /dev/null +++ b/src/main/resources/data/ageofthegods/recipe/olive_stairs2.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "a ", + "aa ", + "aaa" + ], + "key": { + "a": "ageofthegods:olive_planks" + }, + "result": { + "id": "ageofthegods:olive_stairs", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/fence_gates.json b/src/main/resources/data/minecraft/tags/block/fence_gates.json new file mode 100644 index 0000000..c976e1c --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/fence_gates.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ageofthegods:olive_fence_gate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/fences.json b/src/main/resources/data/minecraft/tags/block/fences.json new file mode 100644 index 0000000..551d057 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/fences.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ageofthegods:olive_fence" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/stairs.json b/src/main/resources/data/minecraft/tags/block/stairs.json new file mode 100644 index 0000000..a62455b --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/stairs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ageofthegods:olive_stairs" + ] +} \ No newline at end of file