Skip to content

Commit 10e7032

Browse files
JuuxelJuuxel
committed
neo: Add conditions to models
1 parent b3a7637 commit 10e7032

File tree

1,120 files changed

+8965
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,120 files changed

+8965
-1118
lines changed

‎datagen/src/main/java/juuxel/adorn/datagen/ConditionType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
public enum ConditionType {
99
NONE("none", null, null, Map.of()),
1010
FABRIC("fabric", null, null, Map.of("load-condition", "fabric-conditions.json", "model_condition", "fabric-model-conditions.json")),
11-
FORGE("forge", null, null, Map.of("load-condition", "forge-conditions.json", "loot-table-condition", "forge-loot-conditions.json")),
11+
FORGE("forge", null, null, Map.of("load-condition", "forge-conditions.json", "model_condition", "forge-model-conditions.json")),
1212
;
1313

1414
private static final Map<String, ConditionType> BY_ID = Arrays.stream(values())

‎datagen/src/main/resources/adorn/templates/forge-loot-conditions.json ‎datagen/src/main/resources/adorn/templates/forge-model-conditions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
,
2-
"neoforge:conditions": [
2+
"adorn:conditions": [
33
{
44
"type": "neoforge:mod_loaded",
55
"modid": "<mod-id>"

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/mushy_myonite_brick_platform.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/platform",
33
"textures": {
44
"texture": "architects_palette:block/mushy_myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/mushy_myonite_brick_post.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/post",
33
"textures": {
44
"texture": "architects_palette:block/mushy_myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/mushy_myonite_brick_step.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/step",
33
"textures": {
44
"texture": "architects_palette:block/mushy_myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_brick_platform.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/platform",
33
"textures": {
44
"texture": "architects_palette:block/myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_brick_post.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/post",
33
"textures": {
44
"texture": "architects_palette:block/myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_brick_step.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/step",
33
"textures": {
44
"texture": "architects_palette:block/myonite_bricks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_platform.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/platform",
33
"textures": {
44
"texture": "architects_palette:block/myonite"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_post.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/post",
33
"textures": {
44
"texture": "architects_palette:block/myonite"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/myonite_step.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/step",
33
"textures": {
44
"texture": "architects_palette:block/myonite"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_bench_leg.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@
33
"textures": {
44
"log": "architects_palette:block/twisted_log",
55
"end": "architects_palette:block/twisted_log_top"
6-
}
6+
},
7+
"adorn:conditions": [
8+
{
9+
"type": "neoforge:mod_loaded",
10+
"modid": "architects_palette"
11+
}
12+
]
13+
714
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_bench_top.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/bench_top",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_chair_lower.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/chair_lower",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_chair_upper.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/chair_upper",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_coffee_table.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,12 @@
44
"planks": "architects_palette:block/twisted_planks",
55
"leg": "architects_palette:block/twisted_log",
66
"rim": "architects_palette:block/twisted_log"
7-
}
7+
},
8+
"adorn:conditions": [
9+
{
10+
"type": "neoforge:mod_loaded",
11+
"modid": "architects_palette"
12+
}
13+
]
14+
815
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_drawer.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/drawer",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_kitchen_counter.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/kitchen_counter",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_kitchen_counter_connection_left.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/kitchen_counter_connection_left",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_kitchen_counter_connection_right.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/kitchen_counter_connection_right",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_kitchen_cupboard_door.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/kitchen_cupboard_door",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_kitchen_sink.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/kitchen_sink",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_platform.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/platform",
33
"textures": {
44
"texture": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_post.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/post",
33
"textures": {
44
"texture": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_shelf.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/shelf",
33
"textures": {
44
"texture": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_step.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/step",
33
"textures": {
44
"texture": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_table.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/table",
33
"textures": {
44
"planks": "architects_palette:block/twisted_planks"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/architects_palette/twisted_table_leg.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22
"parent": "adorn:block/templates/table_leg",
33
"textures": {
44
"log": "architects_palette:block/twisted_log"
5-
}
5+
},
6+
"adorn:conditions": [
7+
{
8+
"type": "neoforge:mod_loaded",
9+
"modid": "architects_palette"
10+
}
11+
]
12+
613
}

‎forge/src/main/generatedResources/assets/adorn/models/block/biomemakeover/ancient_oak_bench_leg.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@
33
"textures": {
44
"log": "biomemakeover:block/ancient_oak_log",
55
"end": "biomemakeover:block/ancient_oak_log_top"
6-
}
6+
},
7+
"adorn:conditions": [
8+
{
9+
"type": "neoforge:mod_loaded",
10+
"modid": "biomemakeover"
11+
}
12+
]
13+
714
}

0 commit comments

Comments
 (0)