Skip to content

Commit 76f0e6f

Browse files
committed
TIny tweak before I put this to rest.
1 parent 0fbc5ef commit 76f0e6f

4 files changed

Lines changed: 82 additions & 82 deletions

File tree

common/src/main/generated/resources/data/generations_core/loot_tables/blocks/calyrex_roots.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"bonus_rolls": 0.0,
66
"conditions": [
77
{
8-
"chance": 0.001,
8+
"chance": 0.0025,
99
"condition": "minecraft:random_chance"
1010
},
1111
{

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -57,100 +57,100 @@
5757
"generations_core:scarecrow",
5858
"generations_core:box",
5959
"generations_core:lime_couch_arm_left",
60-
"generations_core:red_couch_arm_left",
61-
"generations_core:brown_couch_arm_left",
62-
"generations_core:green_couch_arm_left",
63-
"generations_core:gray_couch_arm_left",
6460
"generations_core:cyan_couch_arm_left",
61+
"generations_core:magenta_couch_arm_left",
62+
"generations_core:blue_couch_arm_left",
63+
"generations_core:light_blue_couch_arm_left",
64+
"generations_core:red_couch_arm_left",
65+
"generations_core:black_couch_arm_left",
66+
"generations_core:light_gray_couch_arm_left",
6567
"generations_core:white_couch_arm_left",
68+
"generations_core:green_couch_arm_left",
69+
"generations_core:pink_couch_arm_left",
6670
"generations_core:orange_couch_arm_left",
71+
"generations_core:gray_couch_arm_left",
6772
"generations_core:yellow_couch_arm_left",
68-
"generations_core:black_couch_arm_left",
69-
"generations_core:blue_couch_arm_left",
70-
"generations_core:pink_couch_arm_left",
71-
"generations_core:magenta_couch_arm_left",
72-
"generations_core:light_blue_couch_arm_left",
7373
"generations_core:purple_couch_arm_left",
74-
"generations_core:light_gray_couch_arm_left",
74+
"generations_core:brown_couch_arm_left",
7575
"generations_core:lime_couch_arm_right",
76-
"generations_core:red_couch_arm_right",
77-
"generations_core:brown_couch_arm_right",
78-
"generations_core:green_couch_arm_right",
79-
"generations_core:gray_couch_arm_right",
8076
"generations_core:cyan_couch_arm_right",
77+
"generations_core:magenta_couch_arm_right",
78+
"generations_core:blue_couch_arm_right",
79+
"generations_core:light_blue_couch_arm_right",
80+
"generations_core:red_couch_arm_right",
81+
"generations_core:black_couch_arm_right",
82+
"generations_core:light_gray_couch_arm_right",
8183
"generations_core:white_couch_arm_right",
84+
"generations_core:green_couch_arm_right",
85+
"generations_core:pink_couch_arm_right",
8286
"generations_core:orange_couch_arm_right",
87+
"generations_core:gray_couch_arm_right",
8388
"generations_core:yellow_couch_arm_right",
84-
"generations_core:black_couch_arm_right",
85-
"generations_core:blue_couch_arm_right",
86-
"generations_core:pink_couch_arm_right",
87-
"generations_core:magenta_couch_arm_right",
88-
"generations_core:light_blue_couch_arm_right",
8989
"generations_core:purple_couch_arm_right",
90-
"generations_core:light_gray_couch_arm_right",
90+
"generations_core:brown_couch_arm_right",
9191
"generations_core:lime_couch_corner_left",
92-
"generations_core:red_couch_corner_left",
93-
"generations_core:brown_couch_corner_left",
94-
"generations_core:green_couch_corner_left",
95-
"generations_core:gray_couch_corner_left",
9692
"generations_core:cyan_couch_corner_left",
93+
"generations_core:magenta_couch_corner_left",
94+
"generations_core:blue_couch_corner_left",
95+
"generations_core:light_blue_couch_corner_left",
96+
"generations_core:red_couch_corner_left",
97+
"generations_core:black_couch_corner_left",
98+
"generations_core:light_gray_couch_corner_left",
9799
"generations_core:white_couch_corner_left",
100+
"generations_core:green_couch_corner_left",
101+
"generations_core:pink_couch_corner_left",
98102
"generations_core:orange_couch_corner_left",
103+
"generations_core:gray_couch_corner_left",
99104
"generations_core:yellow_couch_corner_left",
100-
"generations_core:black_couch_corner_left",
101-
"generations_core:blue_couch_corner_left",
102-
"generations_core:pink_couch_corner_left",
103-
"generations_core:magenta_couch_corner_left",
104-
"generations_core:light_blue_couch_corner_left",
105105
"generations_core:purple_couch_corner_left",
106-
"generations_core:light_gray_couch_corner_left",
106+
"generations_core:brown_couch_corner_left",
107107
"generations_core:lime_couch_corner_right",
108-
"generations_core:red_couch_corner_right",
109-
"generations_core:brown_couch_corner_right",
110-
"generations_core:green_couch_corner_right",
111-
"generations_core:gray_couch_corner_right",
112108
"generations_core:cyan_couch_corner_right",
109+
"generations_core:magenta_couch_corner_right",
110+
"generations_core:blue_couch_corner_right",
111+
"generations_core:light_blue_couch_corner_right",
112+
"generations_core:red_couch_corner_right",
113+
"generations_core:black_couch_corner_right",
114+
"generations_core:light_gray_couch_corner_right",
113115
"generations_core:white_couch_corner_right",
116+
"generations_core:green_couch_corner_right",
117+
"generations_core:pink_couch_corner_right",
114118
"generations_core:orange_couch_corner_right",
119+
"generations_core:gray_couch_corner_right",
115120
"generations_core:yellow_couch_corner_right",
116-
"generations_core:black_couch_corner_right",
117-
"generations_core:blue_couch_corner_right",
118-
"generations_core:pink_couch_corner_right",
119-
"generations_core:magenta_couch_corner_right",
120-
"generations_core:light_blue_couch_corner_right",
121121
"generations_core:purple_couch_corner_right",
122-
"generations_core:light_gray_couch_corner_right",
122+
"generations_core:brown_couch_corner_right",
123123
"generations_core:lime_couch_middle",
124-
"generations_core:red_couch_middle",
125-
"generations_core:brown_couch_middle",
126-
"generations_core:green_couch_middle",
127-
"generations_core:gray_couch_middle",
128124
"generations_core:cyan_couch_middle",
125+
"generations_core:magenta_couch_middle",
126+
"generations_core:blue_couch_middle",
127+
"generations_core:light_blue_couch_middle",
128+
"generations_core:red_couch_middle",
129+
"generations_core:black_couch_middle",
130+
"generations_core:light_gray_couch_middle",
129131
"generations_core:white_couch_middle",
132+
"generations_core:green_couch_middle",
133+
"generations_core:pink_couch_middle",
130134
"generations_core:orange_couch_middle",
135+
"generations_core:gray_couch_middle",
131136
"generations_core:yellow_couch_middle",
132-
"generations_core:black_couch_middle",
133-
"generations_core:blue_couch_middle",
134-
"generations_core:pink_couch_middle",
135-
"generations_core:magenta_couch_middle",
136-
"generations_core:light_blue_couch_middle",
137137
"generations_core:purple_couch_middle",
138-
"generations_core:light_gray_couch_middle",
138+
"generations_core:brown_couch_middle",
139139
"generations_core:lime_couch_ottoman",
140-
"generations_core:red_couch_ottoman",
141-
"generations_core:brown_couch_ottoman",
142-
"generations_core:green_couch_ottoman",
143-
"generations_core:gray_couch_ottoman",
144140
"generations_core:cyan_couch_ottoman",
141+
"generations_core:magenta_couch_ottoman",
142+
"generations_core:blue_couch_ottoman",
143+
"generations_core:light_blue_couch_ottoman",
144+
"generations_core:red_couch_ottoman",
145+
"generations_core:black_couch_ottoman",
146+
"generations_core:light_gray_couch_ottoman",
145147
"generations_core:white_couch_ottoman",
148+
"generations_core:green_couch_ottoman",
149+
"generations_core:pink_couch_ottoman",
146150
"generations_core:orange_couch_ottoman",
151+
"generations_core:gray_couch_ottoman",
147152
"generations_core:yellow_couch_ottoman",
148-
"generations_core:black_couch_ottoman",
149-
"generations_core:blue_couch_ottoman",
150-
"generations_core:pink_couch_ottoman",
151-
"generations_core:magenta_couch_ottoman",
152-
"generations_core:light_blue_couch_ottoman",
153153
"generations_core:purple_couch_ottoman",
154-
"generations_core:light_gray_couch_ottoman"
154+
"generations_core:brown_couch_ottoman"
155155
]
156156
}

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -805,37 +805,37 @@
805805
"generations_core:desk",
806806
"generations_core:fridge",
807807
"generations_core:lime_street_lamp",
808-
"generations_core:red_street_lamp",
809-
"generations_core:brown_street_lamp",
810-
"generations_core:green_street_lamp",
811-
"generations_core:gray_street_lamp",
812808
"generations_core:cyan_street_lamp",
809+
"generations_core:magenta_street_lamp",
810+
"generations_core:blue_street_lamp",
811+
"generations_core:light_blue_street_lamp",
812+
"generations_core:red_street_lamp",
813+
"generations_core:black_street_lamp",
814+
"generations_core:light_gray_street_lamp",
813815
"generations_core:white_street_lamp",
816+
"generations_core:green_street_lamp",
817+
"generations_core:pink_street_lamp",
814818
"generations_core:orange_street_lamp",
819+
"generations_core:gray_street_lamp",
815820
"generations_core:yellow_street_lamp",
816-
"generations_core:black_street_lamp",
817-
"generations_core:blue_street_lamp",
818-
"generations_core:pink_street_lamp",
819-
"generations_core:magenta_street_lamp",
820-
"generations_core:light_blue_street_lamp",
821821
"generations_core:purple_street_lamp",
822-
"generations_core:light_gray_street_lamp",
822+
"generations_core:brown_street_lamp",
823823
"generations_core:lime_pc",
824-
"generations_core:red_pc",
825-
"generations_core:brown_pc",
826-
"generations_core:green_pc",
827-
"generations_core:gray_pc",
828824
"generations_core:cyan_pc",
825+
"generations_core:magenta_pc",
826+
"generations_core:blue_pc",
827+
"generations_core:light_blue_pc",
828+
"generations_core:red_pc",
829+
"generations_core:black_pc",
830+
"generations_core:light_gray_pc",
829831
"generations_core:white_pc",
832+
"generations_core:green_pc",
833+
"generations_core:pink_pc",
830834
"generations_core:orange_pc",
835+
"generations_core:gray_pc",
831836
"generations_core:yellow_pc",
832-
"generations_core:black_pc",
833-
"generations_core:blue_pc",
834-
"generations_core:pink_pc",
835-
"generations_core:magenta_pc",
836-
"generations_core:light_blue_pc",
837837
"generations_core:purple_pc",
838-
"generations_core:light_gray_pc",
838+
"generations_core:brown_pc",
839839
"generations_core:empty_ball_display",
840840
"generations_core:poke_ball_display",
841841
"generations_core:great_ball_display",

forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/LootTableDatagen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public LootTableDatagen(PackOutput output) {
3737
new SubProviderEntry(GenerationsCoreFishingLoot::new, LootContextParamSets.FISHING),
3838
new SubProviderEntry(() -> op -> op.accept(CALYREX_ROOTS, LootTable.lootTable().withPool(LootPool.lootPool()
3939
.setRolls(ConstantValue.exactly(1))
40-
.when(LootItemRandomChanceCondition.randomChance(1/1000f))
40+
.when(LootItemRandomChanceCondition.randomChance(1/400f))
4141
.when(hasBlockStateProperties(Blocks.CARROTS).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(CropBlock.AGE, 7)))
4242
.add(AlternativesEntry.alternatives(
4343
LootItem.lootTableItem(GenerationsItems.SHADEROOT_CARROT.get())

0 commit comments

Comments
 (0)