Skip to content

Commit

Permalink
Some more changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Codetoil
Codetoil committed Feb 2, 2023
1 parent 9dbcfad commit 7d7425e
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 51 deletions.
32 changes: 16 additions & 16 deletions src/main/resources/assets/redstoneelectronics/blockstates/redstone_rotary_distributor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@
"model": "redstoneelectronics:block/distributor_right_driven",
"y": 0
},
"facing=west,powered=false,selector_orientation=right,driven=true": {
"model": "redstoneelectronics:block/distributor_right_driven",
"y": 90
},
"facing=west,powered=true,selector_orientation=right,driven=true": {
"model": "redstoneelectronics:block/distributor_right_on_driven",
"y": 90
Expand All @@ -188,39 +192,35 @@
"model": "redstoneelectronics:block/distributor_right_on_driven",
"y": 0
},
"facing=west,powered=false,selector_orientation=right,driven=true": {
"model": "redstoneelectronics:block/distributor_right_driven",
"y": 90
},
"facing=north,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"facing=north,powered=false,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating",
"y": 180
},
"facing=east,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"facing=east,powered=false,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating",
"y": 270
},
"facing=south,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"facing=south,powered=false,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating",
"y": 0
},
"facing=west,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"facing=west,powered=false,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating",
"y": 90
},
"facing=north,powered=false,selector_orientation=rotating,driven=true": {
"facing=north,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"y": 180
},
"facing=east,powered=false,selector_orientation=rotating,driven=true": {
"facing=east,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"y": 270
},
"facing=south,powered=false,selector_orientation=rotating,driven=true": {
"facing=south,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"y": 0
},
"facing=west,powered=false,selector_orientation=rotating,driven=true": {
"facing=west,powered=true,selector_orientation=rotating,driven=true": {
"model": "redstoneelectronics:block/distributor_rotating_on",
"y": 90
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_front.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_front_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"lit": "minecraft:block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_front_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_left.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_left_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_left_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_right.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_right_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"lit": "minecraft:block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_right_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/distributor",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "block/comparator"
"particle": "redstoneelectronics:block/distributor"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/distributor_rotating_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/distributor",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator"
"particle": "redstoneelectronics:block/distributor"
},
"elements": [
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/redstoneelectronics/models/block/resistor_1r_on.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"ambientocclusion": false,
"textures": {
"particle": "redstoneelectronics:block/resistor_on",
"particle": "redstoneelectronics:block/resistor",
"slab": "block/smooth_stone",
"top": "redstoneelectronics:block/resistor_on",
"top": "redstoneelectronics:block/resistor",
"lit": "block/redstone_torch"
},
"elements": [
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/redstoneelectronics/models/block/resistor_2r_on.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"ambientocclusion": false,
"textures": {
"particle": "redstoneelectronics:block/resistor_on",
"particle": "redstoneelectronics:block/resistor",
"slab": "block/smooth_stone",
"top": "redstoneelectronics:block/resistor_on",
"top": "redstoneelectronics:block/resistor",
"lit": "block/redstone_torch"
},
"elements": [
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/redstoneelectronics/models/block/resistor_3r_on.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"ambientocclusion": false,
"textures": {
"particle": "redstoneelectronics:block/resistor_on",
"particle": "redstoneelectronics:block/resistor",
"slab": "block/smooth_stone",
"top": "redstoneelectronics:block/resistor_on",
"top": "redstoneelectronics:block/resistor",
"lit": "block/redstone_torch"
},
"elements": [
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/redstoneelectronics/models/block/resistor_4r_on.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"ambientocclusion": false,
"textures": {
"particle": "redstoneelectronics:block/resistor_on",
"particle": "redstoneelectronics:block/resistor",
"slab": "block/smooth_stone",
"top": "redstoneelectronics:block/resistor_on",
"top": "redstoneelectronics:block/resistor",
"lit": "block/redstone_torch"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_front.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_front_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_front_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"lit": "minecraft:block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_front_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_left.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_left_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "block/oak_planks",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_left_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"lit": "minecraft:block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_left_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_right.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"unlit": "minecraft:block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_right_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_right_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
"ambientocclusion": false,
"textures": {
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"lit": "minecraft:block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "minecraft:block/smooth_stone"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_right_on_driven.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator",
"particle": "redstoneelectronics:block/selector",
"oak_planks": "block/oak_planks"
},
"elements": [
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_rotating.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"unlit": "block/redstone_torch_off",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator"
"particle": "redstoneelectronics:block/selector"
},
"elements": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/redstoneelectronics/models/block/selector_rotating_on.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lit": "block/redstone_torch",
"top": "redstoneelectronics:block/selector",
"slab": "block/smooth_stone",
"particle": "minecraft:block/comparator"
"particle": "redstoneelectronics:block/selector"
},
"elements": [
{
Expand Down
Binary file removed src/main/resources/assets/redstoneelectronics/textures/block/resistor_on.png
View file
Binary file not shown.

0 comments on commit 7d7425e

Please sign in to comment.