diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_button.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_button.json new file mode 100644 index 0000000..e99b3a6 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_button.json @@ -0,0 +1,118 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "acesbs:block/fire_oak_button", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "acesbs:block/fire_oak_button", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "acesbs:block/fire_oak_button", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "acesbs:block/fire_oak_button", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "acesbs:block/fire_oak_button", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "acesbs:block/fire_oak_button" + }, + "face=floor,facing=north,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed" + }, + "face=floor,facing=south,powered=false": { + "model": "acesbs:block/fire_oak_button", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "acesbs:block/fire_oak_button", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "acesbs:block/fire_oak_button", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "uvlock": true, + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "acesbs:block/fire_oak_button", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "uvlock": true, + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "acesbs:block/fire_oak_button", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "uvlock": true, + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "acesbs:block/fire_oak_button", + "uvlock": true, + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "acesbs:block/fire_oak_button_pressed", + "uvlock": true, + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_door.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_door.json new file mode 100644 index 0000000..5cdbe0a --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "acesbs:block/fire_oak_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "acesbs:block/fire_oak_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "acesbs:block/fire_oak_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "acesbs:block/fire_oak_door_top_right_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_fence.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_fence.json new file mode 100644 index 0000000..a782c8f --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_fence.json @@ -0,0 +1,48 @@ +{ + "multipart": [ + { + "apply": { + "model": "acesbs:block/fire_oak_fence_post" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_fence_side", + "uvlock": true + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_fence_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_fence_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_fence_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "true" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_fence_gate.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_fence_gate.json new file mode 100644 index 0000000..c7793c1 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_fence_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=east,in_wall=false,open=false": { + "model": "acesbs:block/fire_oak_fence_gate", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=false,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_open", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=false": { + "model": "acesbs:block/fire_oak_fence_gate_wall", + "uvlock": true, + "y": 270 + }, + "facing=east,in_wall=true,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_wall_open", + "uvlock": true, + "y": 270 + }, + "facing=north,in_wall=false,open=false": { + "model": "acesbs:block/fire_oak_fence_gate", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=false,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_open", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=false": { + "model": "acesbs:block/fire_oak_fence_gate_wall", + "uvlock": true, + "y": 180 + }, + "facing=north,in_wall=true,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_wall_open", + "uvlock": true, + "y": 180 + }, + "facing=south,in_wall=false,open=false": { + "model": "acesbs:block/fire_oak_fence_gate", + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_open", + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "acesbs:block/fire_oak_fence_gate_wall", + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "acesbs:block/fire_oak_fence_gate", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=false,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_open", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=false": { + "model": "acesbs:block/fire_oak_fence_gate_wall", + "uvlock": true, + "y": 90 + }, + "facing=west,in_wall=true,open=true": { + "model": "acesbs:block/fire_oak_fence_gate_wall_open", + "uvlock": true, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_leaves.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_leaves.json new file mode 100644 index 0000000..a1efb84 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_leaves.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/fire_oak_leaves" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_log.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_log.json new file mode 100644 index 0000000..9f2b9b3 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "acesbs:block/fire_oak_log_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "acesbs:block/fire_oak_log" + }, + "axis=z": { + "model": "acesbs:block/fire_oak_log_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_planks.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_planks.json new file mode 100644 index 0000000..17395dc --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/fire_oak_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_pressure_plate.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_pressure_plate.json new file mode 100644 index 0000000..b91cd95 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_pressure_plate.json @@ -0,0 +1,10 @@ +{ + "variants": { + "powered=false": { + "model": "acesbs:block/fire_oak_pressure_plate" + }, + "powered=true": { + "model": "acesbs:block/fire_oak_pressure_plate_down" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_slab.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_slab.json new file mode 100644 index 0000000..f88d7bd --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "acesbs:block/fire_oak_slab" + }, + "type=double": { + "model": "acesbs:block/fire_oak_planks" + }, + "type=top": { + "model": "acesbs:block/fire_oak_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_stairs.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_stairs.json new file mode 100644 index 0000000..6aba8f6 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "acesbs:block/fire_oak_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "acesbs:block/fire_oak_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "acesbs:block/fire_oak_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "acesbs:block/fire_oak_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_wall.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_wall.json new file mode 100644 index 0000000..7716743 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "acesbs:block/fire_oak_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "acesbs:block/fire_oak_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/fire_oak_wood.json b/src/main/generated/assets/acesbs/blockstates/fire_oak_wood.json new file mode 100644 index 0000000..a051ba1 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fire_oak_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "acesbs:block/fire_oak_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "acesbs:block/fire_oak_wood" + }, + "axis=z": { + "model": "acesbs:block/fire_oak_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_log.json b/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_log.json new file mode 100644 index 0000000..753d61c --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_log.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "acesbs:block/stripped_fire_oak_log_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "acesbs:block/stripped_fire_oak_log" + }, + "axis=z": { + "model": "acesbs:block/stripped_fire_oak_log_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_wood.json b/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_wood.json new file mode 100644 index 0000000..3cd6612 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/stripped_fire_oak_wood.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "acesbs:block/stripped_fire_oak_wood", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "acesbs:block/stripped_fire_oak_wood" + }, + "axis=z": { + "model": "acesbs:block/stripped_fire_oak_wood", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_button.json b/src/main/generated/assets/acesbs/items/fire_oak_button.json new file mode 100644 index 0000000..378f240 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_button_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_door.json b/src/main/generated/assets/acesbs/items/fire_oak_door.json new file mode 100644 index 0000000..635e62c --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/fire_oak_door" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_fence.json b/src/main/generated/assets/acesbs/items/fire_oak_fence.json new file mode 100644 index 0000000..a793973 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_fence.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_fence_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_fence_gate.json b/src/main/generated/assets/acesbs/items/fire_oak_fence_gate.json new file mode 100644 index 0000000..0320f89 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_fence_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_fence_gate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_leaves.json b/src/main/generated/assets/acesbs/items/fire_oak_leaves.json new file mode 100644 index 0000000..009aec7 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_leaves.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_leaves" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_log.json b/src/main/generated/assets/acesbs/items/fire_oak_log.json new file mode 100644 index 0000000..f7db32f --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_log.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_planks.json b/src/main/generated/assets/acesbs/items/fire_oak_planks.json new file mode 100644 index 0000000..30033aa --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_planks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_pressure_plate.json b/src/main/generated/assets/acesbs/items/fire_oak_pressure_plate.json new file mode 100644 index 0000000..824ae24 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_slab.json b/src/main/generated/assets/acesbs/items/fire_oak_slab.json new file mode 100644 index 0000000..1360b71 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_slab" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_stairs.json b/src/main/generated/assets/acesbs/items/fire_oak_stairs.json new file mode 100644 index 0000000..8d1f3e8 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_stairs" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_wall.json b/src/main/generated/assets/acesbs/items/fire_oak_wall.json new file mode 100644 index 0000000..a67aade --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_wall_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fire_oak_wood.json b/src/main/generated/assets/acesbs/items/fire_oak_wood.json new file mode 100644 index 0000000..1d37ba0 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fire_oak_wood.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stripped_fire_oak_log.json b/src/main/generated/assets/acesbs/items/stripped_fire_oak_log.json new file mode 100644 index 0000000..2eaa0e7 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stripped_fire_oak_log.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stripped_fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stripped_fire_oak_wood.json b/src/main/generated/assets/acesbs/items/stripped_fire_oak_wood.json new file mode 100644 index 0000000..744b870 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stripped_fire_oak_wood.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stripped_fire_oak_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_button.json b/src/main/generated/assets/acesbs/models/block/fire_oak_button.json new file mode 100644 index 0000000..cd31efd --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_button.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_button_inventory.json b/src/main/generated/assets/acesbs/models/block/fire_oak_button_inventory.json new file mode 100644 index 0000000..52dd3db --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_button_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_inventory", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_button_pressed.json b/src/main/generated/assets/acesbs/models/block/fire_oak_button_pressed.json new file mode 100644 index 0000000..0749930 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_button_pressed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/button_pressed", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left.json new file mode 100644 index 0000000..54704c0 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left_open.json new file mode 100644 index 0000000..c76f926 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right.json new file mode 100644 index 0000000..6a72710 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right_open.json new file mode 100644 index 0000000..0031d5f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left.json new file mode 100644 index 0000000..a31eb9c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left_open.json new file mode 100644 index 0000000..9979a97 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right.json new file mode 100644 index 0000000..59d3fc8 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right_open.json new file mode 100644 index 0000000..174a8be --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "acesbs:block/fire_oak_door_bottom", + "top": "acesbs:block/fire_oak_door_top" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate.json new file mode 100644 index 0000000..b2ac055 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_open.json new file mode 100644 index 0000000..6344175 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall.json new file mode 100644 index 0000000..dd8d08e --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall_open.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall_open.json new file mode 100644 index 0000000..0bff492 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_inventory.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_inventory.json new file mode 100644 index 0000000..3804312 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_inventory", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_post.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_post.json new file mode 100644 index 0000000..7667a80 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_post", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_fence_side.json b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_side.json new file mode 100644 index 0000000..685ae93 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_fence_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/fence_side", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_leaves.json b/src/main/generated/assets/acesbs/models/block/fire_oak_leaves.json new file mode 100644 index 0000000..4b3f181 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_leaves.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/leaves", + "textures": { + "all": "acesbs:block/fire_oak_leaves" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_log.json b/src/main/generated/assets/acesbs/models/block/fire_oak_log.json new file mode 100644 index 0000000..c654daa --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "acesbs:block/fire_oak_log_top", + "side": "acesbs:block/fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_log_horizontal.json b/src/main/generated/assets/acesbs/models/block/fire_oak_log_horizontal.json new file mode 100644 index 0000000..e9475da --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_log_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "acesbs:block/fire_oak_log_top", + "side": "acesbs:block/fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_planks.json b/src/main/generated/assets/acesbs/models/block/fire_oak_planks.json new file mode 100644 index 0000000..90df167 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate.json b/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate.json new file mode 100644 index 0000000..209eef3 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_up", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate_down.json b/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate_down.json new file mode 100644 index 0000000..80b5a69 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_pressure_plate_down.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/pressure_plate_down", + "textures": { + "texture": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_slab.json b/src/main/generated/assets/acesbs/models/block/fire_oak_slab.json new file mode 100644 index 0000000..b880332 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "acesbs:block/fire_oak_planks", + "side": "acesbs:block/fire_oak_planks", + "top": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_slab_top.json b/src/main/generated/assets/acesbs/models/block/fire_oak_slab_top.json new file mode 100644 index 0000000..31fe140 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "acesbs:block/fire_oak_planks", + "side": "acesbs:block/fire_oak_planks", + "top": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_stairs.json b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs.json new file mode 100644 index 0000000..ae6da75 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "acesbs:block/fire_oak_planks", + "side": "acesbs:block/fire_oak_planks", + "top": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_inner.json b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_inner.json new file mode 100644 index 0000000..fdc3038 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "acesbs:block/fire_oak_planks", + "side": "acesbs:block/fire_oak_planks", + "top": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_outer.json b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_outer.json new file mode 100644 index 0000000..92dd510 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "acesbs:block/fire_oak_planks", + "side": "acesbs:block/fire_oak_planks", + "top": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_wall_inventory.json b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_inventory.json new file mode 100644 index 0000000..2c93320 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_wall_post.json b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_post.json new file mode 100644 index 0000000..7b5ae07 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side.json b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side.json new file mode 100644 index 0000000..8f6eb0f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side_tall.json b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side_tall.json new file mode 100644 index 0000000..d63c74b --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "acesbs:block/fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fire_oak_wood.json b/src/main/generated/assets/acesbs/models/block/fire_oak_wood.json new file mode 100644 index 0000000..ce36f8f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fire_oak_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "acesbs:block/fire_oak_log", + "side": "acesbs:block/fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log.json b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log.json new file mode 100644 index 0000000..d3b289c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "acesbs:block/stripped_fire_oak_log_top", + "side": "acesbs:block/stripped_fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log_horizontal.json b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log_horizontal.json new file mode 100644 index 0000000..8898d37 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_log_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "acesbs:block/stripped_fire_oak_log_top", + "side": "acesbs:block/stripped_fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_wood.json b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_wood.json new file mode 100644 index 0000000..2d56acf --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/stripped_fire_oak_wood.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "acesbs:block/stripped_fire_oak_log", + "side": "acesbs:block/stripped_fire_oak_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/fire_oak_door.json b/src/main/generated/assets/acesbs/models/item/fire_oak_door.json new file mode 100644 index 0000000..2ce3849 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/fire_oak_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/fire_oak_door" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_log.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_log.json new file mode 100644 index 0000000..d00d8be --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_log.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_log": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_log" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_planks_from_fire_oak_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_log" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_planks_from_fire_oak_log" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_wood.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_wood.json new file mode 100644 index 0000000..a65a478 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_fire_oak_wood.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_wood": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_wood" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_planks_from_fire_oak_wood" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_wood" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_planks_from_fire_oak_wood" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_log.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_log.json new file mode 100644 index 0000000..a3743af --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_log.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_fire_oak_log": { + "conditions": { + "items": [ + { + "items": "acesbs:stripped_fire_oak_log" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_planks_from_stripped_fire_oak_log" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stripped_fire_oak_log" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_planks_from_stripped_fire_oak_log" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_wood.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_wood.json new file mode 100644 index 0000000..b9443b5 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_planks_from_stripped_fire_oak_wood.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_fire_oak_wood": { + "conditions": { + "items": [ + { + "items": "acesbs:stripped_fire_oak_wood" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_planks_from_stripped_fire_oak_wood" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stripped_fire_oak_wood" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_planks_from_stripped_fire_oak_wood" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_slab.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_slab.json new file mode 100644 index 0000000..0e62652 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_slab.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_slab" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_stairs.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_stairs.json new file mode 100644 index 0000000..83be3fa --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_stairs.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_stairs" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wall.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wall.json new file mode 100644 index 0000000..db3b818 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_wall" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_sapling.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wood.json similarity index 71% rename from src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_sapling.json rename to src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wood.json index 700c844..e321340 100644 --- a/src/main/generated/data/acesbs/advancement/recipes/decorations/lemonwood_sapling.json +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fire_oak_wood.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_lemon": { + "has_fire_oak_log": { "conditions": { "items": [ { - "items": "acesbs:lemon" + "items": "acesbs:fire_oak_log" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "acesbs:lemonwood_sapling" + "recipe": "acesbs:fire_oak_wood" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_lemon" + "has_fire_oak_log" ] ], "rewards": { "recipes": [ - "acesbs:lemonwood_sapling" + "acesbs:fire_oak_wood" ] } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/stripped_fire_oak_wood.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/stripped_fire_oak_wood.json new file mode 100644 index 0000000..97e306a --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/stripped_fire_oak_wood.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stripped_fire_oak_log": { + "conditions": { + "items": [ + { + "items": "acesbs:stripped_fire_oak_log" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:stripped_fire_oak_wood" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stripped_fire_oak_log" + ] + ], + "rewards": { + "recipes": [ + "acesbs:stripped_fire_oak_wood" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_fence.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_fence.json new file mode 100644 index 0000000..f5c02a6 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/fire_oak_fence.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_fence" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_fence" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_button.json b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_button.json new file mode 100644 index 0000000..9aefbed --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_button.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_button" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_button" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_door.json b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_door.json new file mode 100644 index 0000000..d9f2e53 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_door.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_door" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_door" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_fence_gate.json b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_fence_gate.json new file mode 100644 index 0000000..d641bca --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_fence_gate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_fence_gate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_fence_gate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_pressure_plate.json b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_pressure_plate.json new file mode 100644 index 0000000..ba93fc3 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_pressure_plate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_pressure_plate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_pressure_plate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_trapdoor.json b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_trapdoor.json new file mode 100644 index 0000000..bd9da13 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/redstone/fire_oak_trapdoor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fire_oak_planks": { + "conditions": { + "items": [ + { + "items": "acesbs:fire_oak_planks" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fire_oak_trapdoor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fire_oak_planks" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fire_oak_trapdoor" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_button.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_button.json new file mode 100644 index 0000000..04f89e3 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_button.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_button" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_door.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_door.json new file mode 100644 index 0000000..106967c --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_door.json @@ -0,0 +1,29 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "acesbs:fire_oak_door", + "condition": "minecraft:block_state_property", + "properties": { + "half": "lower" + } + } + ], + "name": "acesbs:fire_oak_door" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence.json new file mode 100644 index 0000000..efab7a6 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_fence" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence_gate.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence_gate.json new file mode 100644 index 0000000..4dcb329 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_fence_gate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_fence_gate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_leaves.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_leaves.json new file mode 100644 index 0000000..15b9d2a --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_leaves.json @@ -0,0 +1,132 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "acesbs:fire_oak_leaves" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "name": "acesbs:fire_oak_sapling" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_log.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_log.json new file mode 100644 index 0000000..704e2e1 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_log.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_log" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_planks.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_planks.json new file mode 100644 index 0000000..d8cf5e5 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_pressure_plate.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_pressure_plate.json new file mode 100644 index 0000000..8cb12cf --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_pressure_plate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_pressure_plate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_sapling.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_sapling.json new file mode 100644 index 0000000..1671bfb --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_sapling.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_sapling" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_slab.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_slab.json new file mode 100644 index 0000000..78cc5ec --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "acesbs:fire_oak_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "acesbs:fire_oak_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_stairs.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_stairs.json new file mode 100644 index 0000000..55af2ad --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_trapdoor.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_trapdoor.json new file mode 100644 index 0000000..563f662 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_trapdoor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_trapdoor" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wall.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wall.json new file mode 100644 index 0000000..f7feed1 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wood.json b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wood.json new file mode 100644 index 0000000..e983a08 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fire_oak_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fire_oak_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_log.json b/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_log.json new file mode 100644 index 0000000..2a6c5a2 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_log.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:stripped_fire_oak_log" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_wood.json b/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_wood.json new file mode 100644 index 0000000..ec8623f --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/stripped_fire_oak_wood.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:stripped_fire_oak_wood" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_button.json b/src/main/generated/data/acesbs/recipe/fire_oak_button.json new file mode 100644 index 0000000..ef9532f --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_button.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "ingredients": [ + "acesbs:fire_oak_planks" + ], + "result": { + "count": 1, + "id": "acesbs:fire_oak_button" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_door.json b/src/main/generated/data/acesbs/recipe/fire_oak_door.json new file mode 100644 index 0000000..fd3888a --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_door.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "##", + "##", + "##" + ], + "result": { + "count": 3, + "id": "acesbs:fire_oak_door" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_fence.json b/src/main/generated/data/acesbs/recipe/fire_oak_fence.json new file mode 100644 index 0000000..4baa152 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_fence.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "minecraft:stick", + "W": "acesbs:fire_oak_planks" + }, + "pattern": [ + "W#W", + "W#W" + ], + "result": { + "count": 3, + "id": "acesbs:fire_oak_fence" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_fence_gate.json b/src/main/generated/data/acesbs/recipe/fire_oak_fence_gate.json new file mode 100644 index 0000000..2df5f85 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_fence_gate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "#": "minecraft:stick", + "W": "acesbs:fire_oak_planks" + }, + "pattern": [ + "#W#", + "#W#" + ], + "result": { + "count": 1, + "id": "acesbs:fire_oak_fence_gate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_log.json b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_log.json new file mode 100644 index 0000000..6e4b159 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_log.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:fire_oak_log" + ], + "result": { + "count": 4, + "id": "acesbs:fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_wood.json b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_wood.json new file mode 100644 index 0000000..dc0a8e5 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_fire_oak_wood.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:fire_oak_wood" + ], + "result": { + "count": 4, + "id": "acesbs:fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_log.json b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_log.json new file mode 100644 index 0000000..e4a3954 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_log.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:stripped_fire_oak_log" + ], + "result": { + "count": 4, + "id": "acesbs:fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_wood.json b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_wood.json new file mode 100644 index 0000000..f1913b5 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_planks_from_stripped_fire_oak_wood.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:stripped_fire_oak_wood" + ], + "result": { + "count": 4, + "id": "acesbs:fire_oak_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_pressure_plate.json b/src/main/generated/data/acesbs/recipe/fire_oak_pressure_plate.json new file mode 100644 index 0000000..0a52b7e --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_pressure_plate.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "##" + ], + "result": { + "count": 1, + "id": "acesbs:fire_oak_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_slab.json b/src/main/generated/data/acesbs/recipe/fire_oak_slab.json new file mode 100644 index 0000000..7f15813 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "id": "acesbs:fire_oak_slab" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_stairs.json b/src/main/generated/data/acesbs/recipe/fire_oak_stairs.json new file mode 100644 index 0000000..6c1cbbb --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_stairs.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "id": "acesbs:fire_oak_stairs" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_trapdoor.json b/src/main/generated/data/acesbs/recipe/fire_oak_trapdoor.json new file mode 100644 index 0000000..f77b1de --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_trapdoor.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 2, + "id": "acesbs:fire_oak_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_wall.json b/src/main/generated/data/acesbs/recipe/fire_oak_wall.json new file mode 100644 index 0000000..8f1d069 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "acesbs:fire_oak_planks" + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "id": "acesbs:fire_oak_wall" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_wood.json b/src/main/generated/data/acesbs/recipe/fire_oak_wood.json new file mode 100644 index 0000000..286702b --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fire_oak_wood.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "acesbs:fire_oak_log" + }, + "pattern": [ + "## ", + "## ", + " " + ], + "result": { + "count": 3, + "id": "acesbs:fire_oak_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/lemonwood_sapling.json b/src/main/generated/data/acesbs/recipe/lemonwood_sapling.json deleted file mode 100644 index bc9726f..0000000 --- a/src/main/generated/data/acesbs/recipe/lemonwood_sapling.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - "minecraft:birch_sapling", - "acesbs:lemon" - ], - "result": { - "count": 1, - "id": "acesbs:lemonwood_sapling" - } -} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/stripped_fire_oak_wood.json b/src/main/generated/data/acesbs/recipe/stripped_fire_oak_wood.json new file mode 100644 index 0000000..fb8e435 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/stripped_fire_oak_wood.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": "acesbs:stripped_fire_oak_log" + }, + "pattern": [ + "## ", + "## ", + " " + ], + "result": { + "count": 3, + "id": "acesbs:stripped_fire_oak_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/worldgen/configured_feature/fire_oak.json b/src/main/generated/data/acesbs/worldgen/configured_feature/fire_oak.json new file mode 100644 index 0000000..3cf3093 --- /dev/null +++ b/src/main/generated/data/acesbs/worldgen/configured_feature/fire_oak.json @@ -0,0 +1,52 @@ +{ + "type": "minecraft:tree", + "config": { + "decorators": [], + "dirt_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "minecraft:dirt" + } + }, + "foliage_placer": { + "type": "minecraft:blob_foliage_placer", + "height": 3, + "offset": 0, + "radius": 2 + }, + "foliage_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "acesbs:fire_oak_leaves", + "Properties": { + "distance": "7", + "persistent": "false", + "waterlogged": "false" + } + } + }, + "force_dirt": false, + "ignore_vines": false, + "minimum_size": { + "type": "minecraft:two_layers_feature_size", + "limit": 1, + "lower_size": 0, + "upper_size": 1 + }, + "trunk_placer": { + "type": "minecraft:straight_trunk_placer", + "base_height": 4, + "height_rand_a": 2, + "height_rand_b": 0 + }, + "trunk_provider": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "acesbs:fire_oak_log", + "Properties": { + "axis": "y" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/fence_gates.json b/src/main/generated/data/minecraft/tags/block/fence_gates.json index 73246d3..0348486 100644 --- a/src/main/generated/data/minecraft/tags/block/fence_gates.json +++ b/src/main/generated/data/minecraft/tags/block/fence_gates.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:lemonwood_fence_gate" + "acesbs:lemonwood_fence_gate", + "acesbs:fire_oak_fence_gate" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/leaves.json b/src/main/generated/data/minecraft/tags/block/leaves.json index e967204..5621fb0 100644 --- a/src/main/generated/data/minecraft/tags/block/leaves.json +++ b/src/main/generated/data/minecraft/tags/block/leaves.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:lemonwood_leaves" + "acesbs:lemonwood_leaves", + "acesbs:fire_oak_leaves" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/logs.json b/src/main/generated/data/minecraft/tags/block/logs.json new file mode 100644 index 0000000..b5df14a --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/logs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "acesbs:fire_oak_log", + "acesbs:fire_oak_wood", + "acesbs:stripped_fire_oak_log", + "acesbs:stripped_fire_oak_wood" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json index 78e7197..45d11bb 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/axe.json @@ -4,6 +4,10 @@ "acesbs:lemonwood_wall", "acesbs:lemonwood_fence", "acesbs:lemonwood_fence_gate", + "acesbs:fire_oak_planks", + "acesbs:fire_oak_wall", + "acesbs:fire_oak_fence", + "acesbs:fire_oak_fence_gate", "acesbs:lizard_planks", "acesbs:lizard_button" ] diff --git a/src/main/generated/data/minecraft/tags/block/walls.json b/src/main/generated/data/minecraft/tags/block/walls.json index 203cf9c..d38656a 100644 --- a/src/main/generated/data/minecraft/tags/block/walls.json +++ b/src/main/generated/data/minecraft/tags/block/walls.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:lemonwood_wall" + "acesbs:lemonwood_wall", + "acesbs:fire_oak_wall" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/wooden_fences.json b/src/main/generated/data/minecraft/tags/block/wooden_fences.json index e493aeb..7960557 100644 --- a/src/main/generated/data/minecraft/tags/block/wooden_fences.json +++ b/src/main/generated/data/minecraft/tags/block/wooden_fences.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:lemonwood_fence" + "acesbs:lemonwood_fence", + "acesbs:fire_oak_fence" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/planks.json b/src/main/generated/data/minecraft/tags/item/planks.json index 471e5b4..4ec592b 100644 --- a/src/main/generated/data/minecraft/tags/item/planks.json +++ b/src/main/generated/data/minecraft/tags/item/planks.json @@ -1,6 +1,7 @@ { "values": [ "acesbs:lemonwood_planks", + "acesbs:fire_oak_planks", "acesbs:lizard_planks" ] } \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBS.java b/src/main/java/com/acethewildfire/acesbs/AcesBS.java index 50dc6f2..1240c70 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBS.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBS.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.block.entity.ModBlockEntities; import com.acethewildfire.acesbs.component.ModDataComponentTypes; @@ -68,7 +70,7 @@ public class AcesBS implements ModInitializer { ModDataComponentTypes.registerDataComponentsTypes(); - UpdateRecipies.updateVanilla(); + ModLootTableModifier.updateAll(); PlayerBlockBreakEvents.BEFORE.register(new HammerUsageEvent()); AttackEntityCallback.EVENT.register(new YouMonsterEvent()); @@ -81,19 +83,22 @@ public class AcesBS implements ModInitializer { // CompostingChanceRegistry.INSTANCE.add(ModItems.TOBACCO); CompostingChanceRegistry.INSTANCE.add(ModItems.TOBACCO_SEEDS, 0.5f); - StrippableBlockRegistry.register(ModBlocks.LEMONWOOD_LOG, ModBlocks.STRIPPED_LEMONWOOD_LOG); - StrippableBlockRegistry.register(ModBlocks.LEMONWOOD_WOOD, ModBlocks.STRIPPED_LEMONWOOD_WOOD); + StrippableBlockRegistry.register(LemonWoodBlocks.LEMONWOOD_LOG, LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG); + StrippableBlockRegistry.register(LemonWoodBlocks.LEMONWOOD_WOOD, LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_LOG, 5, 5); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_WOOD, 5, 5); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.STRIPPED_LEMONWOOD_LOG, 5, 5); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.STRIPPED_LEMONWOOD_WOOD, 5, 5); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_LOG, 5, 5); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_WOOD, 5, 5); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG, 5, 5); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD, 5, 5); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_PLANKS, 5, 20); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_SLAB, 5, 20); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_STAIRS, 5, 20); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_PLANKS, 5, 20); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_SLAB, 5, 20); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_STAIRS, 5, 20); - FlammableBlockRegistry.getDefaultInstance().add(ModBlocks.LEMONWOOD_LEAVES, 30, 60); + FlammableBlockRegistry.getDefaultInstance().add(LemonWoodBlocks.LEMONWOOD_LEAVES, 30, 60); + + StrippableBlockRegistry.register(FireOakBlocks.FIRE_OAK_LOG, FireOakBlocks.STRIPPED_FIRE_OAK_LOG); + StrippableBlockRegistry.register(FireOakBlocks.FIRE_OAK_WOOD, FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); FabricDefaultAttributeRegistry.register(ModEntities.FREN, FrenEntity.createAttributes()); FabricDefaultAttributeRegistry.register(ModEntities.VULGAR_BONES, SkeletonEntity.createAbstractSkeletonAttributes()); diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java index 09846e8..339a112 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.entity.ModEntities; import com.acethewildfire.acesbs.entity.client.CombustibleLemonModel; @@ -25,13 +27,15 @@ import net.minecraft.client.render.entity.SkeletonEntityRenderer; public class AcesBSClient implements ClientModInitializer { @Override public void onInitializeClient() { - BlockRenderLayerMap.putBlock(ModBlocks.LEMONWOOD_DOOR, BlockRenderLayer.TRANSLUCENT); - BlockRenderLayerMap.putBlock(ModBlocks.LEMONWOOD_TRAPDOOR, BlockRenderLayer.TRANSLUCENT); + BlockRenderLayerMap.putBlock(LemonWoodBlocks.LEMONWOOD_DOOR, BlockRenderLayer.TRANSLUCENT); + BlockRenderLayerMap.putBlock(LemonWoodBlocks.LEMONWOOD_TRAPDOOR, BlockRenderLayer.TRANSLUCENT); BlockRenderLayerMap.putBlock(ModBlocks.CRYSTAL_ENTROPY, BlockRenderLayer.TRANSLUCENT); BlockRenderLayerMap.putBlock(ModBlocks.CRYSTAL_ENTROPY_PANE, BlockRenderLayer.TRANSLUCENT); BlockRenderLayerMap.putBlock(ModBlocks.TOBACCO_CROP, BlockRenderLayer.CUTOUT); - BlockRenderLayerMap.putBlock(ModBlocks.LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); - BlockRenderLayerMap.putBlock(ModBlocks.POTTED_LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(LemonWoodBlocks.LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(LemonWoodBlocks.POTTED_LEMONWOOD_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(FireOakBlocks.FIRE_OAK_SAPLING, BlockRenderLayer.CUTOUT); + BlockRenderLayerMap.putBlock(FireOakBlocks.POTTED_FIRE_OAK_SAPLING, BlockRenderLayer.CUTOUT); EntityModelLayerRegistry.registerModelLayer(FrenModel.FREN, FrenModel::getTexturedModelData); EntityRendererRegistry.register(ModEntities.FREN, FrenRenderer::new); diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index dfcf51f..d20e785 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -3,9 +3,12 @@ - Ashen Smithing Template can be found in Nether Fortress Chests - Prisma Smithing Templates can be given by Armorers as a Hero of the Village Gift. - Hammers are now included in the pickaxe item tag. (aka, to other mods they will be considered a type of pickaxe) +- Fire Oak Trees and associated wood blocks. Obtainable by placing an oak sapling and infernal ashes in an Entropic Entangler ## Fixes - Blocks of Ashen Steel now have a recipe. Not sure how I missed that one. - Hammers are now enchantable and are compatible with pickaxe enchantments. +- Lemonwood Sapling renders as an item now, rather than a block +- Lemonwood Trapdoors face the correct direction ## Changes - Lemonwood saplings are now obtained through an Entropic Entangler recipe (Stable Entropy + Birch Sapling) @@ -17,7 +20,6 @@ - The Combustible Lemon does not render when thrown. -- Red Leaves - Incense Block - Diamond Items - Gold Items? \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java new file mode 100644 index 0000000..8b15e25 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java @@ -0,0 +1,109 @@ +package com.acethewildfire.acesbs.block; + +import com.acethewildfire.acesbs.world.tree.ModBlockSaplingGenerator; +import net.minecraft.block.*; +import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.sound.BlockSoundGroup; + +public class FireOakBlocks { + public static final Block FIRE_OAK_LOG = ModBlocks.registerBlock("fire_oak_log", + properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).sounds(BlockSoundGroup.WOOD))); + public static final Block FIRE_OAK_WOOD = ModBlocks.registerBlock("fire_oak_wood", + properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD))); + public static final Block STRIPPED_FIRE_OAK_LOG = ModBlocks.registerBlock("stripped_fire_oak_log", + properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD))); + public static final Block STRIPPED_FIRE_OAK_WOOD = ModBlocks.registerBlock("stripped_fire_oak_wood", + properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD))); + public static final Block FIRE_OAK_LEAVES = ModBlocks.registerBlock("fire_oak_leaves", + properties -> new UntintedParticleLeavesBlock(0.02f, ParticleTypes.CRIMSON_SPORE, properties.mapColor(MapColor.DARK_RED).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never))); + public static final Block FIRE_OAK_SAPLING = ModBlocks.registerBlock("fire_oak_sapling", + properties -> new SaplingBlock(ModBlockSaplingGenerator.FIRE_OAK, properties.mapColor(MapColor.DARK_RED).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY))); + public static final Block POTTED_FIRE_OAK_SAPLING = ModBlocks.registerBlock("potted_fire_oak_sapling", properties -> new FlowerPotBlock(FIRE_OAK_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); + public static final Block FIRE_OAK_PLANKS = ModBlocks.registerBlock("fire_oak_planks", + properties -> new Block( + properties + .mapColor(MapColor.DARK_RED) + .instrument(NoteBlockInstrument.BASS) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_STAIRS = ModBlocks.registerBlock("fire_oak_stairs", + properties -> new StairsBlock(FIRE_OAK_PLANKS.getDefaultState(), + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_SLAB = ModBlocks.registerBlock("fire_oak_slab", + properties -> new SlabBlock( + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_BUTTON = ModBlocks.registerBlock("fire_oak_button", + properties -> new ButtonBlock(BlockSetType.BIRCH, 10, + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .noCollision() + )); + public static final Block FIRE_OAK_PRESSURE_PLATE = ModBlocks.registerBlock("fire_oak_pressure_plate", + properties -> new PressurePlateBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_FENCE = ModBlocks.registerBlock("fire_oak_fence", + properties -> new FenceBlock( + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_FENCE_GATE = ModBlocks.registerBlock("fire_oak_fence_gate", + properties -> new FenceGateBlock(WoodType.BIRCH, + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_WALL = ModBlocks.registerBlock("fire_oak_wall", + properties -> new WallBlock( + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + + )); + public static final Block FIRE_OAK_DOOR = ModBlocks.registerBlock("fire_oak_door", + properties -> new DoorBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .nonOpaque() + )); + public static final Block FIRE_OAK_TRAPDOOR = ModBlocks.registerBlock("fire_oak_trapdoor", + properties -> new TrapdoorBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.DARK_RED) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .nonOpaque() + )); + + public static void registerFireOakBlocks() { + // Do nothing, this just makes sure the blocks get registered + } +} diff --git a/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java new file mode 100644 index 0000000..77ea417 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java @@ -0,0 +1,112 @@ +package com.acethewildfire.acesbs.block; + +import com.acethewildfire.acesbs.world.tree.ModBlockSaplingGenerator; +import net.minecraft.block.*; +import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.sound.BlockSoundGroup; + +public class LemonWoodBlocks { + public static final Block LEMONWOOD_LOG = ModBlocks.registerBlock("lemonwood_log", + properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).sounds(BlockSoundGroup.WOOD))); + public static final Block LEMONWOOD_WOOD = ModBlocks.registerBlock("lemonwood_wood", + properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); + public static final Block STRIPPED_LEMONWOOD_LOG = ModBlocks.registerBlock("stripped_lemonwood_log", + properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); + public static final Block STRIPPED_LEMONWOOD_WOOD = ModBlocks.registerBlock("stripped_lemonwood_wood", + properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); + public static final Block LEMONWOOD_LEAVES = ModBlocks.registerBlock("lemonwood_leaves", + properties -> new UntintedParticleLeavesBlock(0.02f, ParticleTypes.PALE_OAK_LEAVES, properties.mapColor(MapColor.DARK_GREEN).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).burnable().pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never))); + public static final Block LEMONWOOD_SAPLING = ModBlocks.registerBlock("lemonwood_sapling", + properties -> new SaplingBlock(ModBlockSaplingGenerator.LEMONWOOD, properties.mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY))); + public static final Block POTTED_LEMONWOOD_SAPLING = ModBlocks.registerBlock("potted_lemonwood_sapling", properties -> new FlowerPotBlock(LEMONWOOD_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); + public static final Block LEMONWOOD_PLANKS = ModBlocks.registerBlock("lemonwood_planks", + properties -> new Block( + properties + .mapColor(MapColor.PALE_YELLOW) + .instrument(NoteBlockInstrument.BASS) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_STAIRS = ModBlocks.registerBlock("lemonwood_stairs", + properties -> new StairsBlock(LEMONWOOD_PLANKS.getDefaultState(), + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_SLAB = ModBlocks.registerBlock("lemonwood_slab", + properties -> new SlabBlock( + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_BUTTON = ModBlocks.registerBlock("lemonwood_button", + properties -> new ButtonBlock(BlockSetType.BIRCH, 10, + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + .noCollision() + )); + public static final Block LEMONWOOD_PRESSURE_PLATE = ModBlocks.registerBlock("lemonwood_pressure_plate", + properties -> new PressurePlateBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_FENCE = ModBlocks.registerBlock("lemonwood_fence", + properties -> new FenceBlock( + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_FENCE_GATE = ModBlocks.registerBlock("lemonwood_fence_gate", + properties -> new FenceGateBlock(WoodType.BIRCH, + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_WALL = ModBlocks.registerBlock("lemonwood_wall", + properties -> new WallBlock( + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + )); + public static final Block LEMONWOOD_DOOR = ModBlocks.registerBlock("lemonwood_door", + properties -> new DoorBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + .nonOpaque() + )); + public static final Block LEMONWOOD_TRAPDOOR = ModBlocks.registerBlock("lemonwood_trapdoor", + properties -> new TrapdoorBlock(BlockSetType.BIRCH, + properties + .mapColor(MapColor.PALE_YELLOW) + .strength(2.0F, 3.0F) + .sounds(BlockSoundGroup.WOOD) + .burnable() + .nonOpaque() + )); + + public static void registerLemonwoodBlocks() { + // Do nothing, this just makes sure the blocks get registered + } +} diff --git a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java index fc4b0de..78e7bd1 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -3,7 +3,6 @@ package com.acethewildfire.acesbs.block; import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.block.custom.*; import com.acethewildfire.acesbs.sounds.ModSounds; -import com.acethewildfire.acesbs.world.tree.ModBlockSaplingGenerator; import com.mojang.serialization.MapCodec; import net.minecraft.block.*; import net.minecraft.block.enums.NoteBlockInstrument; @@ -11,10 +10,8 @@ import net.minecraft.block.piston.PistonBehavior; import net.minecraft.component.type.TooltipDisplayComponent; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; -import net.minecraft.particle.ParticleTypes; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; @@ -139,112 +136,6 @@ public class ModBlocks { )); - public static final Block LEMONWOOD_LOG = registerBlock("lemonwood_log", - properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).sounds(BlockSoundGroup.WOOD))); - public static final Block LEMONWOOD_WOOD = registerBlock("lemonwood_wood", - properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); - public static final Block STRIPPED_LEMONWOOD_LOG = registerBlock("stripped_lemonwood_log", - properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); - public static final Block STRIPPED_LEMONWOOD_WOOD = registerBlock("stripped_lemonwood_wood", - properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); - - public static final Block LEMONWOOD_LEAVES = registerBlock("lemonwood_leaves", - properties -> new UntintedParticleLeavesBlock(0.02f, ParticleTypes.PALE_OAK_LEAVES, properties.mapColor(MapColor.DARK_GREEN).strength(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).nonOpaque().allowsSpawning(Blocks::canSpawnOnLeaves).suffocates(Blocks::never).blockVision(Blocks::never).burnable().pistonBehavior(PistonBehavior.DESTROY).solidBlock(Blocks::never))); - public static final Block LEMONWOOD_SAPLING = registerBlock("lemonwood_sapling", - properties -> new SaplingBlock(ModBlockSaplingGenerator.LEMONWOOD, properties.mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY))); - - public static final Block POTTED_LEMONWOOD_SAPLING = registerBlock("potted_lemonwood_sapling", properties -> new FlowerPotBlock(LEMONWOOD_SAPLING, properties.breakInstantly().nonOpaque().pistonBehavior(PistonBehavior.DESTROY))); - - public static final Block LEMONWOOD_PLANKS = registerBlock("lemonwood_planks", - properties -> new Block( - properties - .mapColor(MapColor.PALE_YELLOW) - .instrument(NoteBlockInstrument.BASS) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - - - public static final Block LEMONWOOD_STAIRS = registerBlock("lemonwood_stairs", - properties -> new StairsBlock(ModBlocks.LEMONWOOD_PLANKS.getDefaultState(), - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - public static final Block LEMONWOOD_SLAB = registerBlock("lemonwood_slab", - properties -> new SlabBlock( - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - - public static final Block LEMONWOOD_BUTTON = registerBlock("lemonwood_button", - properties -> new ButtonBlock(BlockSetType.BIRCH, 10, - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - .noCollision() - )); - public static final Block LEMONWOOD_PRESSURE_PLATE = registerBlock("lemonwood_pressure_plate", - properties -> new PressurePlateBlock(BlockSetType.BIRCH, - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - - public static final Block LEMONWOOD_FENCE = registerBlock("lemonwood_fence", - properties -> new FenceBlock( - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - public static final Block LEMONWOOD_FENCE_GATE = registerBlock("lemonwood_fence_gate", - properties -> new FenceGateBlock(WoodType.BIRCH, - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - public static final Block LEMONWOOD_WALL = registerBlock("lemonwood_wall", - properties -> new WallBlock( - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - )); - - public static final Block LEMONWOOD_DOOR = registerBlock("lemonwood_door", - properties -> new DoorBlock(BlockSetType.BIRCH, - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - .nonOpaque() - )); - public static final Block LEMONWOOD_TRAPDOOR = registerBlock("lemonwood_trapdoor", - properties -> new TrapdoorBlock(BlockSetType.BIRCH, - properties - .mapColor(MapColor.PALE_YELLOW) - .strength(2.0F, 3.0F) - .sounds(BlockSoundGroup.WOOD) - .burnable() - .nonOpaque() - )); - public static final Block LIZARD_PLANKS = registerBlock("lizard_planks", properties -> new Block( properties @@ -362,7 +253,7 @@ public class ModBlocks { ) ); - private static Block registerBlock(String name, Function function) { + public static Block registerBlock(String name, Function function) { Block toRegister = function.apply(AbstractBlock.Settings.create().registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(AcesBS.MOD_ID, name)))); registerBlockItem(name, toRegister); return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name), toRegister); @@ -403,6 +294,8 @@ public class ModBlocks { public static void registerModBlocks(){ AcesBS.LOGGER.info("Registering Mod Blocks for " + AcesBS.MOD_ID); + LemonWoodBlocks.registerLemonwoodBlocks(); + FireOakBlocks.registerFireOakBlocks(); // ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(fabricItemGroupEntries -> { // fabricItemGroupEntries.add(ENTROPY_BLOCK); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java index ab9887f..a6e7d13 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs.datagen; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.util.ModTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -51,10 +53,14 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { valueLookupBuilder(BlockTags.AXE_MINEABLE) - .add(ModBlocks.LEMONWOOD_PLANKS) - .add(ModBlocks.LEMONWOOD_WALL) - .add(ModBlocks.LEMONWOOD_FENCE) - .add(ModBlocks.LEMONWOOD_FENCE_GATE) + .add(LemonWoodBlocks.LEMONWOOD_PLANKS) + .add(LemonWoodBlocks.LEMONWOOD_WALL) + .add(LemonWoodBlocks.LEMONWOOD_FENCE) + .add(LemonWoodBlocks.LEMONWOOD_FENCE_GATE) + .add(FireOakBlocks.FIRE_OAK_PLANKS) + .add(FireOakBlocks.FIRE_OAK_WALL) + .add(FireOakBlocks.FIRE_OAK_FENCE) + .add(FireOakBlocks.FIRE_OAK_FENCE_GATE) .add(ModBlocks.LIZARD_PLANKS) .add(ModBlocks.LIZARD_BUTTON); @@ -62,26 +68,36 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(ModBlocks.INFERNAL_ASHES_BLOCK); valueLookupBuilder(BlockTags.WOODEN_FENCES) - .add(ModBlocks.LEMONWOOD_FENCE); + .add(LemonWoodBlocks.LEMONWOOD_FENCE) + .add(FireOakBlocks.FIRE_OAK_FENCE); valueLookupBuilder(BlockTags.FENCE_GATES) - .add(ModBlocks.LEMONWOOD_FENCE_GATE); + .add(LemonWoodBlocks.LEMONWOOD_FENCE_GATE) + .add(FireOakBlocks.FIRE_OAK_FENCE_GATE); valueLookupBuilder(BlockTags.WALLS) - .add(ModBlocks.LEMONWOOD_WALL); + .add(LemonWoodBlocks.LEMONWOOD_WALL) + .add(FireOakBlocks.FIRE_OAK_WALL); valueLookupBuilder(BlockTags.IMPERMEABLE) .add(ModBlocks.CRYSTAL_ENTROPY) .add(ModBlocks.CRYSTAL_ENTROPY_PANE); valueLookupBuilder(BlockTags.LEAVES) - .add(ModBlocks.LEMONWOOD_LEAVES); + .add(LemonWoodBlocks.LEMONWOOD_LEAVES) + .add(FireOakBlocks.FIRE_OAK_LEAVES); valueLookupBuilder(BlockTags.LOGS_THAT_BURN) - .add(ModBlocks.LEMONWOOD_LOG) - .add(ModBlocks.LEMONWOOD_WOOD) - .add(ModBlocks.STRIPPED_LEMONWOOD_LOG) - .add(ModBlocks.STRIPPED_LEMONWOOD_WOOD); + .add(LemonWoodBlocks.LEMONWOOD_LOG) + .add(LemonWoodBlocks.LEMONWOOD_WOOD) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); + + valueLookupBuilder(BlockTags.LOGS) + .add(FireOakBlocks.FIRE_OAK_LOG) + .add(FireOakBlocks.FIRE_OAK_WOOD) + .add(FireOakBlocks.STRIPPED_FIRE_OAK_LOG) + .add(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); // Common Block Tags valueLookupBuilder(ConventionalBlockTags.ORES) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java index 65e825b..683c7a6 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs.datagen; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.item.*; import com.acethewildfire.acesbs.util.ModTags; @@ -125,13 +127,14 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { .add(ModItems.CRAB_RAVE_MUSIC_DISC); valueLookupBuilder(ItemTags.LOGS_THAT_BURN) - .add(ModBlocks.LEMONWOOD_LOG.asItem()) - .add(ModBlocks.LEMONWOOD_WOOD.asItem()) - .add(ModBlocks.STRIPPED_LEMONWOOD_LOG.asItem()) - .add(ModBlocks.STRIPPED_LEMONWOOD_WOOD.asItem()); + .add(LemonWoodBlocks.LEMONWOOD_LOG.asItem()) + .add(LemonWoodBlocks.LEMONWOOD_WOOD.asItem()) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG.asItem()) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD.asItem()); valueLookupBuilder(ItemTags.PLANKS) - .add(ModBlocks.LEMONWOOD_PLANKS.asItem()) + .add(LemonWoodBlocks.LEMONWOOD_PLANKS.asItem()) + .add(FireOakBlocks.FIRE_OAK_PLANKS.asItem()) .add(ModBlocks.LIZARD_PLANKS.asItem()); valueLookupBuilder(ItemTags.MEAT) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java index 6e261b5..fc467c1 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModLootTableProvider.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs.datagen; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.block.custom.TobaccoCrop; import com.acethewildfire.acesbs.item.ModItems; @@ -32,15 +34,10 @@ import net.minecraft.predicate.item.EnchantmentPredicate; import net.minecraft.predicate.item.EnchantmentsPredicate; import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.registry.RegistryEntryLookup; -import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.registry.entry.RegistryEntryList; -import net.minecraft.registry.tag.TagKey; import java.util.List; -import java.util.Optional; import java.util.concurrent.CompletableFuture; public class ModLootTableProvider extends FabricBlockLootTableProvider { @@ -71,23 +68,41 @@ public class ModLootTableProvider extends FabricBlockLootTableProvider { addDrop(ModBlocks.LIZARD_PLANKS); addDrop(ModBlocks.LIZARD_BUTTON); - addDrop(ModBlocks.LEMONWOOD_LOG); - addDrop(ModBlocks.STRIPPED_LEMONWOOD_LOG); - addDrop(ModBlocks.LEMONWOOD_WOOD); - addDrop(ModBlocks.STRIPPED_LEMONWOOD_WOOD); - addDrop(ModBlocks.LEMONWOOD_SAPLING); - addDrop(ModBlocks.LEMONWOOD_LEAVES, leavesDrops(ModBlocks.LEMONWOOD_LEAVES, ModBlocks.LEMONWOOD_SAPLING, 0.0625f)); + addDrop(LemonWoodBlocks.LEMONWOOD_LOG); + addDrop(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG); + addDrop(LemonWoodBlocks.LEMONWOOD_WOOD); + addDrop(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); + addDrop(LemonWoodBlocks.LEMONWOOD_SAPLING); + addDrop(LemonWoodBlocks.LEMONWOOD_LEAVES, leavesDrops(LemonWoodBlocks.LEMONWOOD_LEAVES, LemonWoodBlocks.LEMONWOOD_SAPLING, 0.0625f)); - addDrop(ModBlocks.LEMONWOOD_PLANKS); - addDrop(ModBlocks.LEMONWOOD_STAIRS); - addDrop(ModBlocks.LEMONWOOD_SLAB, slabDrops(ModBlocks.LEMONWOOD_SLAB)); - addDrop(ModBlocks.LEMONWOOD_BUTTON); - addDrop(ModBlocks.LEMONWOOD_PRESSURE_PLATE); - addDrop(ModBlocks.LEMONWOOD_FENCE); - addDrop(ModBlocks.LEMONWOOD_FENCE_GATE); - addDrop(ModBlocks.LEMONWOOD_WALL); - addDrop(ModBlocks.LEMONWOOD_DOOR, doorDrops(ModBlocks.LEMONWOOD_DOOR)); - addDrop(ModBlocks.LEMONWOOD_TRAPDOOR); + addDrop(LemonWoodBlocks.LEMONWOOD_PLANKS); + addDrop(LemonWoodBlocks.LEMONWOOD_STAIRS); + addDrop(LemonWoodBlocks.LEMONWOOD_SLAB, slabDrops(LemonWoodBlocks.LEMONWOOD_SLAB)); + addDrop(LemonWoodBlocks.LEMONWOOD_BUTTON); + addDrop(LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE); + addDrop(LemonWoodBlocks.LEMONWOOD_FENCE); + addDrop(LemonWoodBlocks.LEMONWOOD_FENCE_GATE); + addDrop(LemonWoodBlocks.LEMONWOOD_WALL); + addDrop(LemonWoodBlocks.LEMONWOOD_DOOR, doorDrops(LemonWoodBlocks.LEMONWOOD_DOOR)); + addDrop(LemonWoodBlocks.LEMONWOOD_TRAPDOOR); + + addDrop(FireOakBlocks.FIRE_OAK_LOG); + addDrop(FireOakBlocks.STRIPPED_FIRE_OAK_LOG); + addDrop(FireOakBlocks.FIRE_OAK_WOOD); + addDrop(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); + addDrop(FireOakBlocks.FIRE_OAK_SAPLING); + addDrop(FireOakBlocks.FIRE_OAK_LEAVES, leavesDrops(FireOakBlocks.FIRE_OAK_LEAVES, FireOakBlocks.FIRE_OAK_SAPLING, 0.0625f)); + + addDrop(FireOakBlocks.FIRE_OAK_PLANKS); + addDrop(FireOakBlocks.FIRE_OAK_STAIRS); + addDrop(FireOakBlocks.FIRE_OAK_SLAB, slabDrops(FireOakBlocks.FIRE_OAK_SLAB)); + addDrop(FireOakBlocks.FIRE_OAK_BUTTON); + addDrop(FireOakBlocks.FIRE_OAK_PRESSURE_PLATE); + addDrop(FireOakBlocks.FIRE_OAK_FENCE); + addDrop(FireOakBlocks.FIRE_OAK_FENCE_GATE); + addDrop(FireOakBlocks.FIRE_OAK_WALL); + addDrop(FireOakBlocks.FIRE_OAK_DOOR, doorDrops(FireOakBlocks.FIRE_OAK_DOOR)); + addDrop(FireOakBlocks.FIRE_OAK_TRAPDOOR); addDrop(ModBlocks.ORDERED_CORE); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index bd873cc..494453c 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -1,5 +1,7 @@ package com.acethewildfire.acesbs.datagen; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.block.custom.EvilBlock; import com.acethewildfire.acesbs.block.custom.TobaccoCrop; @@ -17,8 +19,6 @@ import net.minecraft.client.render.model.json.WeightedVariant; import net.minecraft.util.Identifier; import net.minecraft.util.collection.Pool; -import java.util.Optional; - public class ModModelProvider extends FabricModelProvider { public ModModelProvider(FabricDataOutput output) { @@ -46,28 +46,47 @@ public class ModModelProvider extends FabricModelProvider { BlockStateModelGenerator.BlockTexturePool lizardPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.LIZARD_PLANKS); lizardPool.button(ModBlocks.LIZARD_BUTTON); - BlockStateModelGenerator.BlockTexturePool lemonwoodPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.LEMONWOOD_PLANKS); + BlockStateModelGenerator.BlockTexturePool lemonwoodPool = blockStateModelGenerator.registerCubeAllModelTexturePool(LemonWoodBlocks.LEMONWOOD_PLANKS); + lemonwoodPool.stairs(LemonWoodBlocks.LEMONWOOD_STAIRS); + lemonwoodPool.slab(LemonWoodBlocks.LEMONWOOD_SLAB); - lemonwoodPool.stairs(ModBlocks.LEMONWOOD_STAIRS); - lemonwoodPool.slab(ModBlocks.LEMONWOOD_SLAB); + lemonwoodPool.button(LemonWoodBlocks.LEMONWOOD_BUTTON); + lemonwoodPool.pressurePlate(LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE); - lemonwoodPool.button(ModBlocks.LEMONWOOD_BUTTON); - lemonwoodPool.pressurePlate(ModBlocks.LEMONWOOD_PRESSURE_PLATE); + lemonwoodPool.fence(LemonWoodBlocks.LEMONWOOD_FENCE); + lemonwoodPool.fenceGate(LemonWoodBlocks.LEMONWOOD_FENCE_GATE); + lemonwoodPool.wall(LemonWoodBlocks.LEMONWOOD_WALL); - lemonwoodPool.fence(ModBlocks.LEMONWOOD_FENCE); - lemonwoodPool.fenceGate(ModBlocks.LEMONWOOD_FENCE_GATE); - lemonwoodPool.wall(ModBlocks.LEMONWOOD_WALL); + blockStateModelGenerator.createLogTexturePool(LemonWoodBlocks.LEMONWOOD_LOG).log(LemonWoodBlocks.LEMONWOOD_LOG).wood(LemonWoodBlocks.LEMONWOOD_WOOD); + blockStateModelGenerator.createLogTexturePool(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG).log(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG).wood(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); - blockStateModelGenerator.createLogTexturePool(ModBlocks.LEMONWOOD_LOG).log(ModBlocks.LEMONWOOD_LOG).wood(ModBlocks.LEMONWOOD_WOOD); - blockStateModelGenerator.createLogTexturePool(ModBlocks.STRIPPED_LEMONWOOD_LOG).log(ModBlocks.STRIPPED_LEMONWOOD_LOG).wood(ModBlocks.STRIPPED_LEMONWOOD_WOOD); + blockStateModelGenerator.registerSingleton(LemonWoodBlocks.LEMONWOOD_LEAVES, TexturedModel.LEAVES); +// blockStateModelGenerator.registerFlowerPotPlant(LemonWoodBlocks.LEMONWOOD_SAPLING, LemonWoodBlocks.POTTED_LEMONWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); - blockStateModelGenerator.registerSingleton(ModBlocks.LEMONWOOD_LEAVES, TexturedModel.LEAVES); -// blockStateModelGenerator.registerTintableCross(ModBlocks.LEMONWOOD_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED); - blockStateModelGenerator.registerFlowerPotPlant(ModBlocks.LEMONWOOD_SAPLING, ModBlocks.POTTED_LEMONWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); + blockStateModelGenerator.registerDoor(LemonWoodBlocks.LEMONWOOD_DOOR); +// blockStateModelGenerator.registerTrapdoor(LemonWoodBlocks.LEMONWOOD_TRAPDOOR); - blockStateModelGenerator.registerDoor(ModBlocks.LEMONWOOD_DOOR); - blockStateModelGenerator.registerTrapdoor(ModBlocks.LEMONWOOD_TRAPDOOR); + BlockStateModelGenerator.BlockTexturePool fireOakPool = blockStateModelGenerator.registerCubeAllModelTexturePool(FireOakBlocks.FIRE_OAK_PLANKS); + + fireOakPool.stairs(FireOakBlocks.FIRE_OAK_STAIRS); + fireOakPool.slab(FireOakBlocks.FIRE_OAK_SLAB); + + fireOakPool.button(FireOakBlocks.FIRE_OAK_BUTTON); + fireOakPool.pressurePlate(FireOakBlocks.FIRE_OAK_PRESSURE_PLATE); + + fireOakPool.fence(FireOakBlocks.FIRE_OAK_FENCE); + fireOakPool.fenceGate(FireOakBlocks.FIRE_OAK_FENCE_GATE); + fireOakPool.wall(FireOakBlocks.FIRE_OAK_WALL); + + blockStateModelGenerator.createLogTexturePool(FireOakBlocks.FIRE_OAK_LOG).log(FireOakBlocks.FIRE_OAK_LOG).wood(FireOakBlocks.FIRE_OAK_WOOD); + blockStateModelGenerator.createLogTexturePool(FireOakBlocks.STRIPPED_FIRE_OAK_LOG).log(FireOakBlocks.STRIPPED_FIRE_OAK_LOG).wood(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); + + blockStateModelGenerator.registerSingleton(FireOakBlocks.FIRE_OAK_LEAVES, TexturedModel.LEAVES); +// blockStateModelGenerator.registerFlowerPotPlant(FireOakBlocks.FIRE_OAK_SAPLING, FireOakBlocks.POTTED_FIRE_OAK_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); + + blockStateModelGenerator.registerDoor(FireOakBlocks.FIRE_OAK_DOOR); +// blockStateModelGenerator.registerTrapdoor(FireOakBlocks.FIRE_OAK_TRAPDOOR); Identifier lampOffIdentifier = TexturedModel.CUBE_ALL.upload(ModBlocks.EVIL_BLOCK, blockStateModelGenerator.modelCollector); Identifier lampOnIdentifier = blockStateModelGenerator.createSubModel(ModBlocks.EVIL_BLOCK, "_on", Models.CUBE_ALL, TextureMap::all); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 7cde208..668ad1e 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -1,12 +1,13 @@ package com.acethewildfire.acesbs.datagen; import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; import com.acethewildfire.acesbs.trim.ModTrimPatterns; -import com.acethewildfire.acesbs.util.ModTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags; @@ -51,6 +52,7 @@ public class ModRecipeProvider extends FabricRecipeProvider { // offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.RAW_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.ENDTROPY_BLOCK); // offerReversibleCompactingRecipes(recipeExporter, RecipeCategory.BUILDING_BLOCKS, ModItems.STABLE_ENTROPY, RecipeCategory.DECORATIONS, ModBlocks.STABLE_ENDTROPY_BLOCK); offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, PrismaSteelItems.PRISMA_STEEL, RecipeCategory.DECORATIONS, ModBlocks.PRISMA_STEEL_BLOCK); + offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, AshenSteelItems.ASHEN_STEEL, RecipeCategory.DECORATIONS, ModBlocks.ASHEN_STEEL_BLOCK); offerReversibleCompactingRecipes(RecipeCategory.BUILDING_BLOCKS, ModItems.INFERNAL_ASHES, RecipeCategory.DECORATIONS, ModBlocks.INFERNAL_ASHES_BLOCK); @@ -194,48 +196,6 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModBlocks.LIZARD_PLANKS), conditionsFromItem(ModBlocks.LIZARD_PLANKS)) .offerTo(recipeExporter); - createShapeless(RecipeCategory.DECORATIONS, ModBlocks.LEMONWOOD_SAPLING, 1) - .input(Blocks.BIRCH_SAPLING, 1) - .input(ModItems.LEMON, 1) - .criterion(hasItem(ModItems.LEMON), conditionsFromItem(ModItems.LEMON)) - .offerTo(recipeExporter); - - createShapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_PLANKS, 4) - .input(ModBlocks.LEMONWOOD_LOG, 1) - .criterion(hasItem(ModBlocks.LEMONWOOD_LOG), conditionsFromItem(ModBlocks.LEMONWOOD_LOG)) - .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_lemonwood_log"))); - - createShapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_PLANKS, 4) - .input(ModBlocks.STRIPPED_LEMONWOOD_LOG, 1) - .criterion(hasItem(ModBlocks.STRIPPED_LEMONWOOD_LOG), conditionsFromItem(ModBlocks.STRIPPED_LEMONWOOD_LOG)) - .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_stripped_lemonwood_log"))); - - createShapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_PLANKS, 4) - .input(ModBlocks.LEMONWOOD_WOOD, 1) - .criterion(hasItem(ModBlocks.LEMONWOOD_WOOD), conditionsFromItem(ModBlocks.LEMONWOOD_WOOD)) - .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_lemonwood_wood"))); - - createShapeless(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_PLANKS, 4) - .input(ModBlocks.STRIPPED_LEMONWOOD_WOOD, 1) - .criterion(hasItem(ModBlocks.STRIPPED_LEMONWOOD_WOOD), conditionsFromItem(ModBlocks.STRIPPED_LEMONWOOD_WOOD)) - .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_stripped_lemonwood_wood"))); - - createShaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_WOOD, 3) - .pattern("## ") - .pattern("## ") - .pattern(" ") - .input('#', ModBlocks.LEMONWOOD_LOG) - .criterion(hasItem(ModBlocks.LEMONWOOD_LOG), conditionsFromItem(ModBlocks.LEMONWOOD_LOG)) - .offerTo(recipeExporter); - - createShaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.STRIPPED_LEMONWOOD_WOOD, 3) - .pattern("## ") - .pattern("## ") - .pattern(" ") - .input('#', ModBlocks.STRIPPED_LEMONWOOD_LOG) - .criterion(hasItem(ModBlocks.STRIPPED_LEMONWOOD_LOG), conditionsFromItem(ModBlocks.STRIPPED_LEMONWOOD_LOG)) - .offerTo(recipeExporter); - createShaped(RecipeCategory.FOOD, ModItems.BUBBLE_PIPE, 1) .pattern(" #") .pattern("PPP") @@ -245,34 +205,143 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(Blocks.BIRCH_PLANKS), conditionsFromItem(Blocks.BIRCH_PLANKS)) .offerTo(recipeExporter); - createStairsRecipe(ModBlocks.LEMONWOOD_STAIRS, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) - .offerTo(recipeExporter); - createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_SLAB, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) +// createShapeless(RecipeCategory.DECORATIONS, LemonWoodBlocks.LEMONWOOD_SAPLING, 1) +// .input(Blocks.BIRCH_SAPLING, 1) +// .input(ModItems.LEMON, 1) +// .criterion(hasItem(ModItems.LEMON), conditionsFromItem(ModItems.LEMON)) +// .offerTo(recipeExporter); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_PLANKS, 4) + .input(LemonWoodBlocks.LEMONWOOD_LOG, 1) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_LOG), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_LOG)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_lemonwood_log"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_PLANKS, 4) + .input(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG, 1) + .criterion(hasItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG), conditionsFromItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_stripped_lemonwood_log"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_PLANKS, 4) + .input(LemonWoodBlocks.LEMONWOOD_WOOD, 1) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_WOOD), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_WOOD)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_lemonwood_wood"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_PLANKS, 4) + .input(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD, 1) + .criterion(hasItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD), conditionsFromItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "lemonwood_planks_from_stripped_lemonwood_wood"))); + + createShaped(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_WOOD, 3) + .pattern("## ") + .pattern("## ") + .pattern(" ") + .input('#', LemonWoodBlocks.LEMONWOOD_LOG) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_LOG), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_LOG)) .offerTo(recipeExporter); - createShapeless(RecipeCategory.REDSTONE, ModBlocks.LEMONWOOD_BUTTON, 1) - .input(ModBlocks.LEMONWOOD_PLANKS, 1) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) - .offerTo(recipeExporter); - createPressurePlateRecipe(RecipeCategory.REDSTONE, ModBlocks.LEMONWOOD_PRESSURE_PLATE, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) + createShaped(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD, 3) + .pattern("## ") + .pattern("## ") + .pattern(" ") + .input('#', LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG) + .criterion(hasItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG), conditionsFromItem(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG)) .offerTo(recipeExporter); - createFenceRecipe(ModBlocks.LEMONWOOD_FENCE, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) + createStairsRecipe(LemonWoodBlocks.LEMONWOOD_STAIRS, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) .offerTo(recipeExporter); - createFenceGateRecipe(ModBlocks.LEMONWOOD_FENCE_GATE, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_SLAB, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) .offerTo(recipeExporter); - offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, ModBlocks.LEMONWOOD_WALL, ModBlocks.LEMONWOOD_PLANKS); - createDoorRecipe(ModBlocks.LEMONWOOD_DOOR, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) + createShapeless(RecipeCategory.REDSTONE, LemonWoodBlocks.LEMONWOOD_BUTTON, 1) + .input(LemonWoodBlocks.LEMONWOOD_PLANKS, 1) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) .offerTo(recipeExporter); - createTrapdoorRecipe(ModBlocks.LEMONWOOD_TRAPDOOR, Ingredient.ofItems(ModBlocks.LEMONWOOD_PLANKS)) - .criterion(hasItem(ModBlocks.LEMONWOOD_PLANKS), conditionsFromItem(ModBlocks.LEMONWOOD_PLANKS)) + createPressurePlateRecipe(RecipeCategory.REDSTONE, LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); + + createFenceRecipe(LemonWoodBlocks.LEMONWOOD_FENCE, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); + createFenceGateRecipe(LemonWoodBlocks.LEMONWOOD_FENCE_GATE, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); + offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_WALL, LemonWoodBlocks.LEMONWOOD_PLANKS); + + createDoorRecipe(LemonWoodBlocks.LEMONWOOD_DOOR, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); + createTrapdoorRecipe(LemonWoodBlocks.LEMONWOOD_TRAPDOOR, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); + + + createShapeless(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_PLANKS, 4) + .input(FireOakBlocks.FIRE_OAK_LOG, 1) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_LOG), conditionsFromItem(FireOakBlocks.FIRE_OAK_LOG)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "fire_oak_planks_from_fire_oak_log"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_PLANKS, 4) + .input(FireOakBlocks.STRIPPED_FIRE_OAK_LOG, 1) + .criterion(hasItem(FireOakBlocks.STRIPPED_FIRE_OAK_LOG), conditionsFromItem(FireOakBlocks.STRIPPED_FIRE_OAK_LOG)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "fire_oak_planks_from_stripped_fire_oak_log"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_PLANKS, 4) + .input(FireOakBlocks.FIRE_OAK_WOOD, 1) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_WOOD), conditionsFromItem(FireOakBlocks.FIRE_OAK_WOOD)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "fire_oak_planks_from_fire_oak_wood"))); + + createShapeless(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_PLANKS, 4) + .input(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD, 1) + .criterion(hasItem(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD), conditionsFromItem(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD)) + .offerTo(recipeExporter, RegistryKey.of(RegistryKeys.RECIPE, Identifier.of(AcesBS.MOD_ID, "fire_oak_planks_from_stripped_fire_oak_wood"))); + + createShaped(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_WOOD, 3) + .pattern("## ") + .pattern("## ") + .pattern(" ") + .input('#', FireOakBlocks.FIRE_OAK_LOG) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_LOG), conditionsFromItem(FireOakBlocks.FIRE_OAK_LOG)) + .offerTo(recipeExporter); + + createShaped(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.STRIPPED_FIRE_OAK_WOOD, 3) + .pattern("## ") + .pattern("## ") + .pattern(" ") + .input('#', FireOakBlocks.STRIPPED_FIRE_OAK_LOG) + .criterion(hasItem(FireOakBlocks.STRIPPED_FIRE_OAK_LOG), conditionsFromItem(FireOakBlocks.STRIPPED_FIRE_OAK_LOG)) + .offerTo(recipeExporter); + + createStairsRecipe(FireOakBlocks.FIRE_OAK_STAIRS, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_SLAB, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + + createShapeless(RecipeCategory.REDSTONE, FireOakBlocks.FIRE_OAK_BUTTON, 1) + .input(FireOakBlocks.FIRE_OAK_PLANKS, 1) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + createPressurePlateRecipe(RecipeCategory.REDSTONE, FireOakBlocks.FIRE_OAK_PRESSURE_PLATE, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + + createFenceRecipe(FireOakBlocks.FIRE_OAK_FENCE, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + createFenceGateRecipe(FireOakBlocks.FIRE_OAK_FENCE_GATE, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_WALL, FireOakBlocks.FIRE_OAK_PLANKS); + + createDoorRecipe(FireOakBlocks.FIRE_OAK_DOOR, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); + createTrapdoorRecipe(FireOakBlocks.FIRE_OAK_TRAPDOOR, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) .offerTo(recipeExporter); SwordRecipeJsonBuilder(recipeExporter, PrismaSteelItems.PRISMA_STEEL_SWORD, PrismaSteelItems.PRISMA_STEEL, Items.STICK, PrismaSteelItems.PRISMA_STEEL); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index bce3e61..bc87bea 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -1,6 +1,8 @@ package com.acethewildfire.acesbs.item; import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.item.ItemGroup; @@ -75,22 +77,39 @@ public class ModItemGroups { entries.add(ModBlocks.LIZARD_PLANKS); entries.add(ModBlocks.LIZARD_BUTTON); - entries.add(ModBlocks.LEMONWOOD_LOG); - entries.add(ModBlocks.LEMONWOOD_WOOD); - entries.add(ModBlocks.STRIPPED_LEMONWOOD_LOG); - entries.add(ModBlocks.STRIPPED_LEMONWOOD_WOOD); - entries.add(ModBlocks.LEMONWOOD_SAPLING); - entries.add(ModBlocks.LEMONWOOD_LEAVES); - entries.add(ModBlocks.LEMONWOOD_PLANKS); - entries.add(ModBlocks.LEMONWOOD_STAIRS); - entries.add(ModBlocks.LEMONWOOD_SLAB); - entries.add(ModBlocks.LEMONWOOD_BUTTON); - entries.add(ModBlocks.LEMONWOOD_PRESSURE_PLATE); - entries.add(ModBlocks.LEMONWOOD_FENCE); - entries.add(ModBlocks.LEMONWOOD_FENCE_GATE); - entries.add(ModBlocks.LEMONWOOD_WALL); - entries.add(ModBlocks.LEMONWOOD_DOOR); - entries.add(ModBlocks.LEMONWOOD_TRAPDOOR); + entries.add(LemonWoodBlocks.LEMONWOOD_LOG); + entries.add(LemonWoodBlocks.LEMONWOOD_WOOD); + entries.add(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG); + entries.add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD); + entries.add(LemonWoodBlocks.LEMONWOOD_SAPLING); + entries.add(LemonWoodBlocks.LEMONWOOD_LEAVES); + entries.add(LemonWoodBlocks.LEMONWOOD_PLANKS); + entries.add(LemonWoodBlocks.LEMONWOOD_STAIRS); + entries.add(LemonWoodBlocks.LEMONWOOD_SLAB); + entries.add(LemonWoodBlocks.LEMONWOOD_BUTTON); + entries.add(LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE); + entries.add(LemonWoodBlocks.LEMONWOOD_FENCE); + entries.add(LemonWoodBlocks.LEMONWOOD_FENCE_GATE); + entries.add(LemonWoodBlocks.LEMONWOOD_WALL); + entries.add(LemonWoodBlocks.LEMONWOOD_DOOR); + entries.add(LemonWoodBlocks.LEMONWOOD_TRAPDOOR); + + entries.add(FireOakBlocks.FIRE_OAK_LOG); + entries.add(FireOakBlocks.FIRE_OAK_WOOD); + entries.add(FireOakBlocks.STRIPPED_FIRE_OAK_LOG); + entries.add(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD); + entries.add(FireOakBlocks.FIRE_OAK_SAPLING); + entries.add(FireOakBlocks.FIRE_OAK_LEAVES); + entries.add(FireOakBlocks.FIRE_OAK_PLANKS); + entries.add(FireOakBlocks.FIRE_OAK_STAIRS); + entries.add(FireOakBlocks.FIRE_OAK_SLAB); + entries.add(FireOakBlocks.FIRE_OAK_BUTTON); + entries.add(FireOakBlocks.FIRE_OAK_PRESSURE_PLATE); + entries.add(FireOakBlocks.FIRE_OAK_FENCE); + entries.add(FireOakBlocks.FIRE_OAK_FENCE_GATE); + entries.add(FireOakBlocks.FIRE_OAK_WALL); + entries.add(FireOakBlocks.FIRE_OAK_DOOR); + entries.add(FireOakBlocks.FIRE_OAK_TRAPDOOR); entries.add(ModBlocks.EVIL_BLOCK); entries.add(ModBlocks.CRYSTAL_ENTROPY); diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java b/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java index a642583..e0d84ba 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/Wand.java @@ -1,11 +1,11 @@ package com.acethewildfire.acesbs.item.custom; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.component.ModDataComponentTypes; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.component.type.TooltipDisplayComponent; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.Item; @@ -20,7 +20,6 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.world.World; -import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -28,7 +27,7 @@ public class Wand extends Item { private static final Map WAND_MAP = Map.of( Blocks.IRON_ORE, ModBlocks.ENTROPY_ORE, - Blocks.BIRCH_PLANKS, ModBlocks.LEMONWOOD_PLANKS, + Blocks.BIRCH_PLANKS, LemonWoodBlocks.LEMONWOOD_PLANKS, ModBlocks.STABLE_ENTROPY_BLOCK, ModBlocks.EVIL_BLOCK, ModBlocks.EVIL_BLOCK, ModBlocks.STABLE_ENTROPY_BLOCK ); diff --git a/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java b/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java index 3c379dc..d73a7d0 100644 --- a/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java +++ b/src/main/java/com/acethewildfire/acesbs/world/ModConfiguredFeatures.java @@ -1,6 +1,8 @@ package com.acethewildfire.acesbs.world; import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.block.FireOakBlocks; +import com.acethewildfire.acesbs.block.LemonWoodBlocks; import com.acethewildfire.acesbs.block.ModBlocks; import net.minecraft.block.Blocks; import net.minecraft.registry.Registerable; @@ -18,9 +20,11 @@ import net.minecraft.util.math.intprovider.UniformIntProvider; import net.minecraft.util.math.intprovider.WeightedListIntProvider; import net.minecraft.world.gen.feature.*; import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize; +import net.minecraft.world.gen.foliage.BlobFoliagePlacer; import net.minecraft.world.gen.foliage.CherryFoliagePlacer; import net.minecraft.world.gen.stateprovider.BlockStateProvider; import net.minecraft.world.gen.trunk.CherryTrunkPlacer; +import net.minecraft.world.gen.trunk.StraightTrunkPlacer; import java.util.List; @@ -36,6 +40,7 @@ public class ModConfiguredFeatures { public static final RegistryKey> ENDTROPY_ORE_KEY = registerKey("endtropy_ore"); public static final RegistryKey> LEMONWOOD_KEY = registerKey("lemonwood"); + public static final RegistryKey> FIRE_OAK_KEY = registerKey("fire_oak"); public static void bootstrap(Registerable> context) { RuleTest stoneReplaceables = new TagMatchRuleTest(BlockTags.STONE_ORE_REPLACEABLES); @@ -63,14 +68,24 @@ public class ModConfiguredFeatures { register(context, LEMONWOOD_KEY, Feature.TREE, new TreeFeatureConfig.Builder( - BlockStateProvider.of(ModBlocks.LEMONWOOD_LOG), + BlockStateProvider.of(LemonWoodBlocks.LEMONWOOD_LOG), new CherryTrunkPlacer(7, 1, 0, new WeightedListIntProvider(new Pool.Builder().add(ConstantIntProvider.create(1), 1).add(ConstantIntProvider.create(2), 1).add(ConstantIntProvider.create(3), 1).build()), UniformIntProvider.create(2, 4), UniformIntProvider.create(-4, -3), UniformIntProvider.create(-1, 0)), - BlockStateProvider.of(ModBlocks.LEMONWOOD_LEAVES), + BlockStateProvider.of(LemonWoodBlocks.LEMONWOOD_LEAVES), new CherryFoliagePlacer(ConstantIntProvider.create(4), ConstantIntProvider.create(0), ConstantIntProvider.create(5), 0.25F, 0.5F, 0.16666667F, 0.33333334F), new TwoLayersFeatureSize(1, 0, 2)).build() ); + + register(context, FIRE_OAK_KEY, Feature.TREE, new TreeFeatureConfig.Builder( + BlockStateProvider.of(FireOakBlocks.FIRE_OAK_LOG), + new StraightTrunkPlacer(4, 2, 0), + + BlockStateProvider.of(FireOakBlocks.FIRE_OAK_LEAVES), + new BlobFoliagePlacer(ConstantIntProvider.create(2), ConstantIntProvider.create(0), 3), + + new TwoLayersFeatureSize(1, 0, 1)).build() + ); } public static RegistryKey> registerKey(String name) { diff --git a/src/main/java/com/acethewildfire/acesbs/world/tree/ModBlockSaplingGenerator.java b/src/main/java/com/acethewildfire/acesbs/world/tree/ModBlockSaplingGenerator.java index 7d89646..3ee489a 100644 --- a/src/main/java/com/acethewildfire/acesbs/world/tree/ModBlockSaplingGenerator.java +++ b/src/main/java/com/acethewildfire/acesbs/world/tree/ModBlockSaplingGenerator.java @@ -9,4 +9,6 @@ import java.util.Optional; public class ModBlockSaplingGenerator { public static final SaplingGenerator LEMONWOOD = new SaplingGenerator(AcesBS.MOD_ID + ":lemonwood", Optional.empty(), Optional.of(ModConfiguredFeatures.LEMONWOOD_KEY), Optional.empty()); + public static final SaplingGenerator FIRE_OAK = new SaplingGenerator(AcesBS.MOD_ID + ":fire_oak", + Optional.empty(), Optional.of(ModConfiguredFeatures.FIRE_OAK_KEY), Optional.empty()); } diff --git a/src/main/resources/assets/acesbs/blockstates/fire_oak_sapling.json b/src/main/resources/assets/acesbs/blockstates/fire_oak_sapling.json new file mode 100644 index 0000000..b1cda5e --- /dev/null +++ b/src/main/resources/assets/acesbs/blockstates/fire_oak_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/fire_oak_sapling" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/blockstates/fire_oak_trapdoor.json b/src/main/resources/assets/acesbs/blockstates/fire_oak_trapdoor.json new file mode 100644 index 0000000..19b05f5 --- /dev/null +++ b/src/main/resources/assets/acesbs/blockstates/fire_oak_trapdoor.json @@ -0,0 +1,68 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_bottom", + "y": 90 + }, + "facing=east,half=bottom,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_top", + "y": 90 + }, + "facing=east,half=top,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "x": 180, + "y": 270 + }, + "facing=north,half=bottom,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "x": 180, + "y": 180 + }, + "facing=south,half=bottom,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_bottom", + "y": 180 + }, + "facing=south,half=bottom,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_top", + "y": 180 + }, + "facing=south,half=top,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "x": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_bottom", + "y": 270 + }, + "facing=west,half=bottom,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "acesbs:block/fire_oak_trapdoor_top", + "y": 270 + }, + "facing=west,half=top,open=true": { + "model": "acesbs:block/fire_oak_trapdoor_open", + "x": 180, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/lemonwood_sapling.json b/src/main/resources/assets/acesbs/blockstates/lemonwood_sapling.json similarity index 100% rename from src/main/generated/assets/acesbs/blockstates/lemonwood_sapling.json rename to src/main/resources/assets/acesbs/blockstates/lemonwood_sapling.json diff --git a/src/main/generated/assets/acesbs/blockstates/lemonwood_trapdoor.json b/src/main/resources/assets/acesbs/blockstates/lemonwood_trapdoor.json similarity index 72% rename from src/main/generated/assets/acesbs/blockstates/lemonwood_trapdoor.json rename to src/main/resources/assets/acesbs/blockstates/lemonwood_trapdoor.json index 600eca5..9970419 100644 --- a/src/main/generated/assets/acesbs/blockstates/lemonwood_trapdoor.json +++ b/src/main/resources/assets/acesbs/blockstates/lemonwood_trapdoor.json @@ -1,18 +1,21 @@ { "variants": { "facing=east,half=bottom,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_bottom" + "model": "acesbs:block/lemonwood_trapdoor_bottom", + "y": 90 }, "facing=east,half=bottom,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", "y": 90 }, "facing=east,half=top,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_top" + "model": "acesbs:block/lemonwood_trapdoor_top", + "y": 90 }, "facing=east,half=top,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", - "y": 90 + "x": 180, + "y": 270 }, "facing=north,half=bottom,open=false": { "model": "acesbs:block/lemonwood_trapdoor_bottom" @@ -24,35 +27,42 @@ "model": "acesbs:block/lemonwood_trapdoor_top" }, "facing=north,half=top,open=true": { - "model": "acesbs:block/lemonwood_trapdoor_open" + "model": "acesbs:block/lemonwood_trapdoor_open", + "x": 180, + "y": 180 }, "facing=south,half=bottom,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_bottom" + "model": "acesbs:block/lemonwood_trapdoor_bottom", + "y": 180 }, "facing=south,half=bottom,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", "y": 180 }, "facing=south,half=top,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_top" + "model": "acesbs:block/lemonwood_trapdoor_top", + "y": 180 }, "facing=south,half=top,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", - "y": 180 + "x": 180 }, "facing=west,half=bottom,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_bottom" + "model": "acesbs:block/lemonwood_trapdoor_bottom", + "y": 270 }, "facing=west,half=bottom,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", "y": 270 }, "facing=west,half=top,open=false": { - "model": "acesbs:block/lemonwood_trapdoor_top" + "model": "acesbs:block/lemonwood_trapdoor_top", + "y": 270 }, "facing=west,half=top,open=true": { "model": "acesbs:block/lemonwood_trapdoor_open", - "y": 270 + "x": 180, + "y": 90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/blockstates/potted_fire_oak_sapling.json b/src/main/resources/assets/acesbs/blockstates/potted_fire_oak_sapling.json new file mode 100644 index 0000000..dfe0e74 --- /dev/null +++ b/src/main/resources/assets/acesbs/blockstates/potted_fire_oak_sapling.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/potted_fire_oak_sapling" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/potted_lemonwood_sapling.json b/src/main/resources/assets/acesbs/blockstates/potted_lemonwood_sapling.json similarity index 100% rename from src/main/generated/assets/acesbs/blockstates/potted_lemonwood_sapling.json rename to src/main/resources/assets/acesbs/blockstates/potted_lemonwood_sapling.json diff --git a/src/main/resources/assets/acesbs/items/fire_oak_sapling.json b/src/main/resources/assets/acesbs/items/fire_oak_sapling.json new file mode 100644 index 0000000..09344ea --- /dev/null +++ b/src/main/resources/assets/acesbs/items/fire_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/fire_oak_trapdoor.json b/src/main/resources/assets/acesbs/items/fire_oak_trapdoor.json new file mode 100644 index 0000000..537f63d --- /dev/null +++ b/src/main/resources/assets/acesbs/items/fire_oak_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fire_oak_trapdoor_bottom" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_sapling.json b/src/main/resources/assets/acesbs/items/lemonwood_sapling.json similarity index 52% rename from src/main/generated/assets/acesbs/items/lemonwood_sapling.json rename to src/main/resources/assets/acesbs/items/lemonwood_sapling.json index 36edb36..b4c5563 100644 --- a/src/main/generated/assets/acesbs/items/lemonwood_sapling.json +++ b/src/main/resources/assets/acesbs/items/lemonwood_sapling.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "acesbs:block/lemonwood_sapling" + "model": "acesbs:item/lemonwood_sapling" } } \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json b/src/main/resources/assets/acesbs/items/lemonwood_trapdoor.json similarity index 100% rename from src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json rename to src/main/resources/assets/acesbs/items/lemonwood_trapdoor.json diff --git a/src/main/resources/assets/acesbs/items/potted_fire_oak_sapling.json b/src/main/resources/assets/acesbs/items/potted_fire_oak_sapling.json new file mode 100644 index 0000000..5a14d4a --- /dev/null +++ b/src/main/resources/assets/acesbs/items/potted_fire_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/potted_fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json b/src/main/resources/assets/acesbs/items/potted_lemonwood_sapling.json similarity index 100% rename from src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json rename to src/main/resources/assets/acesbs/items/potted_lemonwood_sapling.json diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index b977425..7da79af 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -158,6 +158,24 @@ "block.acesbs.lemonwood_door": "Lemonwood Door", "block.acesbs.lemonwood_trapdoor": "Lemonwood Trapdoor", + "block.acesbs.fire_oak_log": "Fire Oak Log", + "block.acesbs.fire_oak_wood": "Fire Oak Wood", + "block.acesbs.stripped_fire_oak_log": "Stripped Fire Oak Log", + "block.acesbs.stripped_fire_oak_wood": "Stripped Fire Oak Wood", + "block.acesbs.fire_oak_sapling": "Fire Oak Sapling", + "block.acesbs.fire_oak_leaves": "Fire Oak Leaves", + + "block.acesbs.fire_oak_planks": "Fire Oak Planks", + "block.acesbs.fire_oak_stairs": "Fire Oak Stairs", + "block.acesbs.fire_oak_slab": "Fire Oak Slab", + "block.acesbs.fire_oak_button": "Fire Oak Button", + "block.acesbs.fire_oak_pressure_plate": "Fire Oak Pressure Plate", + "block.acesbs.fire_oak_fence": "Fire Oak Fence", + "block.acesbs.fire_oak_fence_gate": "Fire Oak Fence Gate", + "block.acesbs.fire_oak_wall": "Fire Oak Wall", + "block.acesbs.fire_oak_door": "Fire Oak Door", + "block.acesbs.fire_oak_trapdoor": "Fire Oak Trapdoor", + "block.acesbs.evil_block": "Evil Block", "block.acesbs.crystal_entropy": "Crystallized Entropy", "block.acesbs.crystal_entropy_pane": "Crystallized Entropy Pane", diff --git a/src/main/resources/assets/acesbs/models/block/fire_oak_sapling.json b/src/main/resources/assets/acesbs/models/block/fire_oak_sapling.json new file mode 100644 index 0000000..088a729 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/fire_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "acesbs:block/fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_bottom.json b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_bottom.json new file mode 100644 index 0000000..4ef86ee --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_bottom", + "textures": { + "texture": "acesbs:block/fire_oak_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_open.json b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_open.json new file mode 100644 index 0000000..c7e8086 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_open", + "textures": { + "texture": "acesbs:block/fire_oak_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_top.json b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_top.json new file mode 100644 index 0000000..61b9ab5 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/fire_oak_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_top", + "textures": { + "texture": "acesbs:block/fire_oak_trapdoor" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_sapling.json b/src/main/resources/assets/acesbs/models/block/lemonwood_sapling.json similarity index 100% rename from src/main/generated/assets/acesbs/models/block/lemonwood_sapling.json rename to src/main/resources/assets/acesbs/models/block/lemonwood_sapling.json diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_bottom.json b/src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_bottom.json similarity index 100% rename from src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_bottom.json rename to src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_bottom.json diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_open.json b/src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_open.json similarity index 100% rename from src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_open.json rename to src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_open.json diff --git a/src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_top.json b/src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_top.json similarity index 100% rename from src/main/generated/assets/acesbs/models/block/lemonwood_trapdoor_top.json rename to src/main/resources/assets/acesbs/models/block/lemonwood_trapdoor_top.json diff --git a/src/main/resources/assets/acesbs/models/block/potted_fire_oak_sapling.json b/src/main/resources/assets/acesbs/models/block/potted_fire_oak_sapling.json new file mode 100644 index 0000000..065bb42 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/block/potted_fire_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "acesbs:block/fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/potted_lemonwood_sapling.json b/src/main/resources/assets/acesbs/models/block/potted_lemonwood_sapling.json similarity index 100% rename from src/main/generated/assets/acesbs/models/block/potted_lemonwood_sapling.json rename to src/main/resources/assets/acesbs/models/block/potted_lemonwood_sapling.json diff --git a/src/main/resources/assets/acesbs/models/item/fire_oak_sapling.json b/src/main/resources/assets/acesbs/models/item/fire_oak_sapling.json new file mode 100644 index 0000000..bebebfa --- /dev/null +++ b/src/main/resources/assets/acesbs/models/item/fire_oak_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:block/fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/item/lemonwood_sapling.json b/src/main/resources/assets/acesbs/models/item/lemonwood_sapling.json new file mode 100644 index 0000000..7c48953 --- /dev/null +++ b/src/main/resources/assets/acesbs/models/item/lemonwood_sapling.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:block/lemonwood_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_door_bottom.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_door_bottom.png new file mode 100644 index 0000000..65cc131 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_door_bottom.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_door_top.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_door_top.png new file mode 100644 index 0000000..00e1ba5 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_door_top.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_leaves.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_leaves.png new file mode 100644 index 0000000..6542e4e Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_leaves.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_log.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_log.png new file mode 100644 index 0000000..2575f70 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_log.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_log_top.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_log_top.png new file mode 100644 index 0000000..be063da Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_log_top.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_planks.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_planks.png new file mode 100644 index 0000000..7fb0071 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_planks.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_sapling.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_sapling.png new file mode 100644 index 0000000..8bd9b14 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_sapling.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/fire_oak_trapdoor.png b/src/main/resources/assets/acesbs/textures/block/fire_oak_trapdoor.png new file mode 100644 index 0000000..a21c822 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/fire_oak_trapdoor.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/lemonwood_trapdoor.png b/src/main/resources/assets/acesbs/textures/block/lemonwood_trapdoor.png index e942220..07bf8d0 100644 Binary files a/src/main/resources/assets/acesbs/textures/block/lemonwood_trapdoor.png and b/src/main/resources/assets/acesbs/textures/block/lemonwood_trapdoor.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log.png b/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log.png new file mode 100644 index 0000000..e9343dc Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log.png differ diff --git a/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log_top.png b/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log_top.png new file mode 100644 index 0000000..3ac577e Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/stripped_fire_oak_log_top.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/fire_oak_door.png b/src/main/resources/assets/acesbs/textures/item/fire_oak_door.png new file mode 100644 index 0000000..cb4c7a0 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/fire_oak_door.png differ diff --git a/src/main/resources/data/acesbs/recipe/fire_oak_sapling_from_entropic_entangler.json b/src/main/resources/data/acesbs/recipe/fire_oak_sapling_from_entropic_entangler.json new file mode 100644 index 0000000..142c61c --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/fire_oak_sapling_from_entropic_entangler.json @@ -0,0 +1,9 @@ +{ + "type": "acesbs:entropic_entangler", + "ingredient": "minecraft:oak_sapling", + "ingredient2": "acesbs:infernal_ashes", + "result": { + "count": 1, + "id": "acesbs:fire_oak_sapling" + } +} \ No newline at end of file diff --git a/src/main/resources/data/acesbs/recipe/lemonwood_sapling_from_entropic_entangler.json b/src/main/resources/data/acesbs/recipe/lemonwood_sapling_from_entropic_entangler.json new file mode 100644 index 0000000..382fa4f --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/lemonwood_sapling_from_entropic_entangler.json @@ -0,0 +1,9 @@ +{ + "type": "acesbs:entropic_entangler", + "ingredient": "minecraft:birch_sapling", + "ingredient2": "acesbs:stable_entropy", + "result": { + "count": 1, + "id": "acesbs:lemonwood_sapling" + } +} \ No newline at end of file