Skip to content

Commit e0c65d0

Browse files
committed
modify lead bolt recipe & scribe tags
1 parent 0304300 commit e0c65d0

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-09-05T19:34:00.0189291 Oreganized Block Tags
1+
// 1.20.1 2024-09-06T10:44:11.4045918 Oreganized Block Tags
22
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json
33
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json
44
d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json
@@ -30,6 +30,6 @@ a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json
3030
81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json
3131
f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json
3232
6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json
33-
9844c422f9aee3bd87aa2008ccbe179ee652c60b data/oreganized/tags/blocks/mineable/scribe.json
34-
73d66f372d8c4d1b45f3aa477fbb0a97cfa88b10 data/oreganized/tags/blocks/silktouch_using_scribe.json
33+
597a5aa43f0ee7c4bcf4b0e44aa4dfe527557f2b data/oreganized/tags/blocks/mineable/scribe.json
34+
06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json
3535
3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-08-28T12:49:10.1978323 Recipes
1+
// 1.20.1 2024-09-06T10:44:11.3883579 Recipes
22
c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
33
ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
44
40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
@@ -191,7 +191,7 @@ e1c09f2d1950d7e5186f3a1ebaed0d1d9bc20f2a data/oreganized/recipes/gray_crystal_gl
191191
716c99397627e656f05017ee28f973380862691f data/oreganized/recipes/green_crystal_glass_pane.json
192192
fa74ed7a7cbf05b56856f395a780c726c7d4b065 data/oreganized/recipes/lead_bars.json
193193
65befcd063025cfae493e0f156e69cad8c397843 data/oreganized/recipes/lead_block.json
194-
86d1472c32c4c0db36539f7929ecde7460d069ef data/oreganized/recipes/lead_bolt.json
194+
887688824467cf6b5d7c699c740feceb46d2b788 data/oreganized/recipes/lead_bolt.json
195195
9a3d66b85dc44ff589e742ac94a11a513e3a8e85 data/oreganized/recipes/lead_bolt_crate.json
196196
b13c740aa1e59139c3ad6e85c0d6692457ae81e2 data/oreganized/recipes/lead_bolt_from_crate.json
197197
d556fb758fd3dbab160acceee42cd40c0d02170f data/oreganized/recipes/lead_bricks.json

src/generated/resources/data/oreganized/recipes/lead_bolt.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
}
88
},
99
"pattern": [
10-
"A",
1110
"A",
1211
"A"
1312
],

src/generated/resources/data/oreganized/tags/blocks/mineable/scribe.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"#minecraft:ice",
66
"#minecraft:crystal_sound_blocks",
77
"#forge:storage_blocks/amethyst",
8-
"minecraft:budding_amethyst",
8+
"minecraft:amethyst_cluster",
99
"minecraft:large_amethyst_bud",
1010
"minecraft:medium_amethyst_bud",
1111
"minecraft:small_amethyst_bud",
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"values": [
3+
"#oreganized:mineable/scribe",
34
"#minecraft:mineable/pickaxe"
45
]
56
}

src/main/java/galena/oreganized/content/effect/StunningEffect.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
import net.minecraft.world.effect.MobEffect;
66
import net.minecraft.world.effect.MobEffectCategory;
77
import net.minecraft.world.effect.MobEffectInstance;
8-
import net.minecraft.world.effect.MobEffects;
9-
import net.minecraft.world.entity.Entity;
108
import net.minecraft.world.entity.LivingEntity;
119
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
1210
import net.minecraft.world.entity.ai.attributes.Attributes;
1311
import net.minecraftforge.api.distmarker.Dist;
1412
import net.minecraftforge.fml.common.Mod;
1513
import org.jetbrains.annotations.NotNull;
16-
import org.jetbrains.annotations.Nullable;
17-
18-
import java.util.UUID;
1914

2015
@Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, value = Dist.CLIENT)
2116
public class StunningEffect extends MobEffect {
@@ -24,7 +19,7 @@ public class StunningEffect extends MobEffect {
2419
public static final int MAX_AMPLIFIER = 9;
2520

2621
public StunningEffect() {
27-
super(MobEffectCategory.HARMFUL, 0x3B3B63);
22+
super(MobEffectCategory.HARMFUL, 0x6e66a4);
2823
addAttributeModifier(Attributes.MOVEMENT_SPEED, SLOWNESS_UUID, -0.075, AttributeModifier.Operation.MULTIPLY_TOTAL);
2924
}
3025

src/main/java/galena/oreganized/data/ORecipes.java

-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
227227
stonecutting(OBlocks.CUT_LEAD, OBlocks.LEAD_PILLAR.get()).save(consumer, Oreganized.modLoc("stonecutting/lead_pillar_from_cut_lad"));
228228

229229
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, OItems.LEAD_BOLT.get(), 1)
230-
.pattern("A")
231230
.pattern("A")
232231
.pattern("A")
233232
.define('A', OTags.Items.INGOTS_LEAD)

0 commit comments

Comments
 (0)