Skip to content

Commit 98c73b4

Browse files
ArcaratusArcaratus
committed
Added in Fractured and Sparkling Blood Stained Glass
Changed Blood Infused Tool LP drain behavior Force Sigil WIP
1 parent b72c605 commit 98c73b4

40 files changed

+690
-160
lines changed

‎src/generated/resources/.cache/cache

+12
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ b449ded3a89cd3c31d2a83bf623ab67465d3bd4a assets/bloodarsenal/blockstates/blood_i
1111
5993a0c95e73c5c958320aef9292e1a561d2d228 assets/bloodarsenal/blockstates/blood_stained_glass_pane.json
1212
1500b7dcbc0f954e44e48da18a55a996c1bddf3b assets/bloodarsenal/blockstates/demonic_slate.json
1313
c51fe428d7f1aaa895883168d963ae548f8449a5 assets/bloodarsenal/blockstates/ethereal_slate.json
14+
f41cdfd1660c6bf8b762f69f4f7734118fe3eaf7 assets/bloodarsenal/blockstates/fractured_glass.json
1415
0ea0a73bfb20bf6b6a58733d5577ee08e0c92a50 assets/bloodarsenal/blockstates/imbued_slate.json
1516
1240308dc2c6e633864bfd8d822e1ca67ed4cb7e assets/bloodarsenal/blockstates/reinforced_slate.json
17+
79c9a11986085ce4168c15a60a64412aa81a03bc assets/bloodarsenal/blockstates/sparkling_blood_stained_glass.json
1618
da4171aaf8a397c0dcd8f265a1e17949bd3131c3 assets/bloodarsenal/blockstates/stripped_blood_infused_log.json
1719
9d1adbe93de33df32fbd8da1336236e3f33734f9 assets/bloodarsenal/models/block/blank_slate.json
1820
219d26686efe1287c9f979b7ad8f72a6c657a71e assets/bloodarsenal/models/block/blood_infused_glowstone.json
@@ -38,8 +40,10 @@ c94a681cfe96226ba9704b337b00203183e273da assets/bloodarsenal/models/block/blood_
3840
922e292d595a034d200244ac1a076b9f6024ce34 assets/bloodarsenal/models/block/blood_stained_glass_pane_side_alt.json
3941
c573e0d3bf6d8baf08194def34fc9bd6c6877494 assets/bloodarsenal/models/block/demonic_slate.json
4042
923a9128e013f2267f37d9539a7a0ca1baecf4f7 assets/bloodarsenal/models/block/ethereal_slate.json
43+
b3650ac87c4950ef19dce8ccce21f9b7f7c77b24 assets/bloodarsenal/models/block/fractured_glass.json
4144
e490286cd391a225925b1b83b9872f3152f7b3a4 assets/bloodarsenal/models/block/imbued_slate.json
4245
adc3ccce04b436b6654fecb2ef847a808377babc assets/bloodarsenal/models/block/reinforced_slate.json
46+
06ed76853025ee883fc04967f57eb7a0e260fc60 assets/bloodarsenal/models/block/sparkling_blood_stained_glass.json
4347
1712dc3c3db456cdaa3b7cedf25c37e3bde81ca9 assets/bloodarsenal/models/block/stripped_blood_infused_log.json
4448
3939c5e5c853084ea2d7f53f656bede59d9cba6d assets/bloodarsenal/models/item/blank_slate.json
4549
5b0659ff033879c0b0bd10001c7de553ea85e4a2 assets/bloodarsenal/models/item/blood_diamond.json
@@ -67,8 +71,11 @@ b94902264d6d6003e5b26683e2618d4e0a2b35db assets/bloodarsenal/models/item/blood_i
6771
d75255bd519c7d38f316dcf6bc8679be966e24dd assets/bloodarsenal/models/item/blood_stained_glass_pane.json
6872
9fd7198a14441fca8f7e1d4ce4566d4d8fb852ab assets/bloodarsenal/models/item/bound_blood_diamond.json
6973
1e6096f4a1bc34372fd6024f487e971e53d154b0 assets/bloodarsenal/models/item/demonic_slate.json
74+
a3edd6bcedeabaff302169e90ba7452fb47cb8d2 assets/bloodarsenal/models/item/divinity_sigil.json
7075
27a2d92f44d094d46025c817254f3875abc8955f assets/bloodarsenal/models/item/ender_sigil.json
7176
fd32185a52eb16c6ca05f8be042f5d1d2ab1d353 assets/bloodarsenal/models/item/ethereal_slate.json
77+
f0ddf5065f7eed97d04048b67fdd26fb9e44bbcc assets/bloodarsenal/models/item/force_sigil.json
78+
426fe84845ef4a9ebe65998a13bfcc3475818d49 assets/bloodarsenal/models/item/fractured_glass.json
7279
d569bd06267c35359a24228895e73a9d84957578 assets/bloodarsenal/models/item/glass_dagger_of_sacrifice.json
7380
d6f64532107882a5155378a4780f1cc87de86cb6 assets/bloodarsenal/models/item/glass_sacrificial_dagger.json
7481
0c38ac096614d32330d80b28ab780779779bafd6 assets/bloodarsenal/models/item/glass_shard.json
@@ -82,8 +89,11 @@ d1627522e5976e368c0249c27354ac32ceebaa3a assets/bloodarsenal/models/item/infused
8289
2e1ed029073169ac7e8e652435f8ba15054b82ab assets/bloodarsenal/models/item/reagent_lightning.json
8390
e35fab2a662a1c32b2552b736e77b4a3ebe961f8 assets/bloodarsenal/models/item/reagent_swimming.json
8491
e9a039e5066682c3d72c35743dc038e1faf169e6 assets/bloodarsenal/models/item/reinforced_slate.json
92+
e81b95f9439c16196c12b127fbcee89fbbdd5fcd assets/bloodarsenal/models/item/sparkling_blood_stained_glass.json
8593
05a4a0ea4347f611e557d97110f2bab408f8637f assets/bloodarsenal/models/item/stasis_plate.json
8694
077f28d97e329834131d1e6e8f57c0dc0a7477ab assets/bloodarsenal/models/item/stripped_blood_infused_log.json
95+
f0f7a6df6e458b078734fd93a5c1cd0aa1316446 assets/bloodarsenal/models/item/variants/divinity_sigil_activated.json
96+
13e6bd5a73dd959a767e05f13da13c7c4da2d4ad assets/bloodarsenal/models/item/variants/divinity_sigil_deactivated.json
8797
2785c06d14574e07a5b59b05b17144a1e479604d data/bloodarsenal/advancements/recipes/bloodarsenal/blood_infused_wooden_axe.json
8898
bcc3ba2a820bea112b89be11fb1679f635f05090 data/bloodarsenal/advancements/recipes/bloodarsenal/blood_infused_wooden_pickaxe.json
8999
9bbd8ae71fa222eb380c7b7c22849c1676c8ae8e data/bloodarsenal/advancements/recipes/bloodarsenal/blood_infused_wooden_shovel.json
@@ -101,8 +111,10 @@ f5de5eabbb6adfe77d3b0368947c27203c1beb09 data/bloodarsenal/loot_tables/blocks/bl
101111
9a18e179e2d1de3aaf7c7f4b43a76b250efc6795 data/bloodarsenal/loot_tables/blocks/blood_stained_glass_pane.json
102112
43f4a26741ac8ab618c9ffd68172afa688cce36f data/bloodarsenal/loot_tables/blocks/demonic_slate.json
103113
31b5acfb018bb2b056de720d2ab063d3a3d8df7a data/bloodarsenal/loot_tables/blocks/ethereal_slate.json
114+
846de06619dca7c8823245b00fea2ea2f1e0575e data/bloodarsenal/loot_tables/blocks/fractured_glass.json
104115
6602ed9c1866dbc3c559a417bca2494f0ae95323 data/bloodarsenal/loot_tables/blocks/imbued_slate.json
105116
3c800153e2bbf50cddfd01603336d153e62a36ea data/bloodarsenal/loot_tables/blocks/reinforced_slate.json
117+
815c9306b6dd2020f32d030c2fa9151f8a1f2db1 data/bloodarsenal/loot_tables/blocks/sparkling_blood_stained_glass.json
106118
d2c3731d3ca0aa8a2cddf62fc16e6d9c3cf7a788 data/bloodarsenal/loot_tables/blocks/stripped_blood_infused_log.json
107119
4acc83470d76745c834556c08b5d3d3539d7e352 data/bloodarsenal/recipes/blood_infused_wooden_axe.json
108120
855c808942ff2874bcb321bafba641ac937efec3 data/bloodarsenal/recipes/blood_infused_wooden_pickaxe.json

‎src/generated/resources/assets/bloodarsenal/blockstates/fractured_glass.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "bloodarsenal:block/fractured_glass"
5+
}
6+
}
7+
}

‎src/generated/resources/assets/bloodarsenal/blockstates/sparkling_blood_stained_glass.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "bloodarsenal:block/sparkling_blood_stained_glass"
5+
}
6+
}
7+
}

‎src/generated/resources/assets/bloodarsenal/models/block/fractured_glass.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "bloodarsenal:block/fractured_glass"
5+
}
6+
}

‎src/generated/resources/assets/bloodarsenal/models/block/sparkling_blood_stained_glass.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "bloodarsenal:block/sparkling_blood_stained_glass"
5+
}
6+
}

‎src/generated/resources/assets/bloodarsenal/models/item/divinity_sigil.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"overrides": [
3+
{
4+
"predicate": {
5+
"bloodmagic:active": 0.0
6+
},
7+
"model": "bloodarsenal:item/variants/divinity_sigil_deactivated"
8+
},
9+
{
10+
"predicate": {
11+
"bloodmagic:active": 1.0
12+
},
13+
"model": "bloodarsenal:item/variants/divinity_sigil_activated"
14+
}
15+
]
16+
}

‎src/generated/resources/assets/bloodarsenal/models/item/force_sigil.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "bloodarsenal:item/force_sigil"
5+
}
6+
}

‎src/generated/resources/assets/bloodarsenal/models/item/fractured_glass.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "bloodarsenal:block/fractured_glass"
3+
}

‎src/generated/resources/assets/bloodarsenal/models/item/sparkling_blood_stained_glass.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "bloodarsenal:block/sparkling_blood_stained_glass"
3+
}

‎src/generated/resources/assets/bloodarsenal/models/item/variants/divinity_sigil_activated.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "bloodarsenal:item/divinity_sigil_activated"
5+
}
6+
}

‎src/generated/resources/assets/bloodarsenal/models/item/variants/divinity_sigil_deactivated.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "bloodarsenal:item/divinity_sigil_deactivated"
5+
}
6+
}

‎src/generated/resources/data/bloodarsenal/loot_tables/blocks/fractured_glass.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"name": "main",
6+
"rolls": 1,
7+
"entries": [
8+
{
9+
"type": "minecraft:item",
10+
"name": "bloodarsenal:fractured_glass"
11+
}
12+
],
13+
"conditions": [
14+
{
15+
"condition": "minecraft:survives_explosion"
16+
}
17+
]
18+
}
19+
]
20+
}

‎src/generated/resources/data/bloodarsenal/loot_tables/blocks/sparkling_blood_stained_glass.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "minecraft:block",
3+
"pools": [
4+
{
5+
"name": "main",
6+
"rolls": 1,
7+
"entries": [
8+
{
9+
"type": "minecraft:item",
10+
"name": "bloodarsenal:sparkling_blood_stained_glass"
11+
}
12+
],
13+
"conditions": [
14+
{
15+
"condition": "minecraft:survives_explosion"
16+
}
17+
]
18+
}
19+
]
20+
}

‎src/main/java/arcaratus/bloodarsenal/client/ClientProxy.java

+2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ private void clientSetup(FMLClientSetupEvent event)
3030

3131
private static void registerRenderTypes()
3232
{
33+
RenderTypeLookup.setRenderLayer(ModBlocks.FRACTURED_GLASS.get(), RenderType.getTranslucent());
3334
RenderTypeLookup.setRenderLayer(ModBlocks.BLOOD_STAINED_GLASS.get(), RenderType.getTranslucent());
35+
RenderTypeLookup.setRenderLayer(ModBlocks.SPARKLING_BLOOD_STAINED_GLASS.get(), RenderType.getTranslucent());
3436
RenderTypeLookup.setRenderLayer(ModBlocks.BLOOD_STAINED_GLASS_PANE.get(), RenderType.getTranslucent());
3537
}
3638

‎src/main/java/arcaratus/bloodarsenal/common/BloodArsenal.java

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public class BloodArsenal
2828

2929
public static IProxy proxy = new IProxy() {};
3030

31+
public static boolean curiosLoaded = false;
32+
3133
public BloodArsenal()
3234
{
3335
DistExecutor.callWhenOn(Dist.CLIENT, () -> () -> proxy = new ClientProxy());

‎src/main/java/arcaratus/bloodarsenal/common/ConfigHandler.java

+8
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public static class Common
4545
public final ForgeConfigSpec.IntValue lightningSigilMaxLevel;
4646
public final ForgeConfigSpec.IntValue lightningSigilCost;
4747
public final ForgeConfigSpec.IntValue lightningSigilCooldown;
48+
public final ForgeConfigSpec.IntValue divinitySigilCost;
49+
public final ForgeConfigSpec.IntValue forceSigilCost;
4850

4951
public final ForgeConfigSpec.DoubleValue rayTraceRange;
5052

@@ -90,6 +92,12 @@ public Common(ForgeConfigSpec.Builder builder)
9092
lightningSigilCooldown = builder
9193
.comment("The cooldown (in ticks) after using the Lightning Sigil. Default: 20")
9294
.defineInRange("lightningSigilCooldown", 20, 0, Integer.MAX_VALUE);
95+
divinitySigilCost = builder
96+
.comment("The amount of LP used every 5 seconds by the Divinity Sigil. Default: 10000")
97+
.defineInRange("divinitySigilCost", 10000, 0, Integer.MAX_VALUE);
98+
forceSigilCost = builder
99+
.comment("The amount of LP used for every usage of the Force Sigil. Default: 2000")
100+
.defineInRange("forceSigilCost", 2000, 0, Integer.MAX_VALUE);
93101
builder.pop();
94102

95103
builder.push("misc");

‎src/main/java/arcaratus/bloodarsenal/common/block/BloodStainedGlassBlock.java ‎src/main/java/arcaratus/bloodarsenal/common/block/BloodArsenalGlassBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import net.minecraft.block.AbstractGlassBlock;
44

5-
public class BloodStainedGlassBlock extends AbstractGlassBlock
5+
public class BloodArsenalGlassBlock extends AbstractGlassBlock
66
{
7-
public BloodStainedGlassBlock(Properties properties)
7+
public BloodArsenalGlassBlock(Properties properties)
88
{
99
super(properties);
1010
}

‎src/main/java/arcaratus/bloodarsenal/common/block/BloodStainedGlassPaneBlock.java ‎src/main/java/arcaratus/bloodarsenal/common/block/BloodArsenalGlassPaneBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import net.minecraft.block.PaneBlock;
44

5-
public class BloodStainedGlassPaneBlock extends PaneBlock
5+
public class BloodArsenalGlassPaneBlock extends PaneBlock
66
{
7-
public BloodStainedGlassPaneBlock(Properties properties)
7+
public BloodArsenalGlassPaneBlock(Properties properties)
88
{
99
super(properties);
1010
}

‎src/main/java/arcaratus/bloodarsenal/common/block/ModBlocks.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ public final class ModBlocks
3030
public static final RegistryObject<Block> STRIPPED_BLOOD_INFUSED_LOG = registerBlock("stripped_blood_infused_log", new RotatedPillarBlock(Properties.create(Material.WOOD, state -> state.get(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MaterialColor.CRIMSON_HYPHAE : MaterialColor.ADOBE).hardnessAndResistance(3, 6).sound(SoundType.WOOD)));
3131
public static final RegistryObject<Block> BLOOD_INFUSED_IRON_BLOCK = registerBlock("blood_infused_iron_block", new BloodArsenalBlock(PROP_BLOOD_INFUSED_IRON));
3232
public static final RegistryObject<Block> BLOOD_INFUSED_GLOWSTONE = registerBlock("blood_infused_glowstone", new BloodArsenalBlock(Properties.create(Material.GLASS, MaterialColor.RED).hardnessAndResistance(0.75F, 1).sound(SoundType.GLASS).setLightLevel(s -> 15)));
33-
public static final RegistryObject<Block> BLOOD_STAINED_GLASS = registerBlock("blood_stained_glass", new BloodStainedGlassBlock(PROP_BLOOD_STAINED_GLASS));
34-
public static final RegistryObject<Block> BLOOD_STAINED_GLASS_PANE = registerBlock("blood_stained_glass_pane", new BloodStainedGlassPaneBlock(PROP_BLOOD_STAINED_GLASS));
33+
public static final RegistryObject<Block> FRACTURED_GLASS = registerBlock("fractured_glass", new BloodArsenalGlassBlock(Properties.from(Blocks.GLASS)));
34+
public static final RegistryObject<Block> BLOOD_STAINED_GLASS = registerBlock("blood_stained_glass", new BloodArsenalGlassBlock(PROP_BLOOD_STAINED_GLASS));
35+
public static final RegistryObject<Block> SPARKLING_BLOOD_STAINED_GLASS = registerBlock("sparkling_blood_stained_glass", new BloodArsenalGlassBlock(PROP_BLOOD_STAINED_GLASS.setLightLevel(s -> 15)));
36+
public static final RegistryObject<Block> BLOOD_STAINED_GLASS_PANE = registerBlock("blood_stained_glass_pane", new BloodArsenalGlassPaneBlock(PROP_BLOOD_STAINED_GLASS));
3537
public static final RegistryObject<Block> BLOOD_INFUSED_WOOD_STAIRS = registerBlock("blood_infused_wood_stairs", new StairsBlock(() -> BLOOD_INFUSED_PLANKS.get().getDefaultState(), PROP_BLOOD_INFUSED_WOOD));
3638
public static final RegistryObject<Block> BLOOD_INFUSED_WOOD_SLAB = registerBlock("blood_infused_wood_slab", new SlabBlock(PROP_BLOOD_INFUSED_WOOD));
3739
public static final RegistryObject<Block> BLOOD_INFUSED_WOOD_FENCE = registerBlock("blood_infused_wood_fence", new FenceBlock(PROP_BLOOD_INFUSED_WOOD));

0 commit comments

Comments
 (0)