Skip to content

Commit

Permalink
Fixed occlusion for basin foundry lid, fixed id tomfoolery with unbor…
Browse files Browse the repository at this point in the history
…ed very small cannon layers
  • Loading branch information
rbasamoyai committed Sep 20, 2022
1 parent e39d1f5 commit addf8c8
Show file tree
Hide file tree
Showing 21 changed files with 129 additions and 57 deletions.
30 changes: 17 additions & 13 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ a61463b50627b99e8ed315bff77f0574e4163643 assets/createbigcannons/blockstates/unb
28e63bb8258b371690798ddceb16dd015173f674 assets/createbigcannons/blockstates/unbored_steel_sliding_breech.json
18b44bc80bde3ad97f5470851899e4aebb0548cf assets/createbigcannons/blockstates/unbored_very_large_nethersteel_cannon_layer.json
8931b5bc56605b275d075ab0331d5c9b29f6b5aa assets/createbigcannons/blockstates/unbored_very_large_steel_cannon_layer.json
261f39bec3eef29fe30f2453845ed67104c3ff08 assets/createbigcannons/blockstates/unbored_very_small_cannon_layer.json
98379810ee5284a3e73879e8a18b2fc306e62585 assets/createbigcannons/blockstates/unbored_very_small_nethersteel_cannon_layer.json
e109f0e95640774abfb365a0783bda490039217a assets/createbigcannons/blockstates/unbored_very_small_steel_cannon_layer.json
43a945b89fbc9d374f471b58844306d24b2cf006 assets/createbigcannons/blockstates/very_large_cast_mould.json
5c7781afcaa8dc71ca269cf3fa2f5c41d4b68bbe assets/createbigcannons/blockstates/very_large_nethersteel_cannon_layer.json
2b42fc32d50f0da46680df4f98e6812839cb4093 assets/createbigcannons/blockstates/very_large_steel_cannon_layer.json
Expand All @@ -89,8 +90,8 @@ c58a162ab33e2d4841b7ccde59fa022506ef5dcc assets/createbigcannons/blockstates/ver
4357cba70de35133daa7d491981557b763211c64 assets/createbigcannons/blockstates/wrought_iron_cannon_chamber.json
8cc31b88cd6093baa4caddb02ff7f7ff793299f4 assets/createbigcannons/blockstates/wrought_iron_cannon_end.json
d942040026b2849ca2153a9933e8dc0c5c39f3c9 assets/createbigcannons/blockstates/yaw_controller.json
2f11e436d07b911c69a3175560a035c12e5f946e assets/createbigcannons/lang/en_ud.json
660d5a74eb7d5fd7e467dccafd480be51caadc9d assets/createbigcannons/lang/en_us.json
26b52052d99ed72428550894e19175df85ce8898 assets/createbigcannons/lang/en_ud.json
9b96e7e9caaaba9cdf22a69bf7742cb39b90f041 assets/createbigcannons/lang/en_us.json
4fac2e2b0fe542e4f9e0579146379a585e98f74b assets/createbigcannons/models/block/bag_of_grapeshot.json
a39127cff89f7c428602eef326265cafdf2c9765 assets/createbigcannons/models/block/bronze_cannon_barrel.json
a076a29645a51c52dd8d13019b9bfc629b657eaf assets/createbigcannons/models/block/bronze_cannon_chamber.json
Expand Down Expand Up @@ -173,7 +174,8 @@ ce53e253117f0493b072479531c73f3ea56a5b4c assets/createbigcannons/models/block/un
7d0b50511d23f1778a6a8bc5e3c9f8cb6a7aabee assets/createbigcannons/models/block/unbored_steel_sliding_breech_rotated.json
4e61a9c3440864d14b9e832f5fbd7e81d74e4887 assets/createbigcannons/models/block/unbored_very_large_nethersteel_cannon_layer.json
acbae2258d0053c1df5662f72f65822208ee8af3 assets/createbigcannons/models/block/unbored_very_large_steel_cannon_layer.json
3cea33f90fd4c75f756010258de917f15c2a9eaf assets/createbigcannons/models/block/unbored_very_small_cannon_layer.json
3cea33f90fd4c75f756010258de917f15c2a9eaf assets/createbigcannons/models/block/unbored_very_small_nethersteel_cannon_layer.json
b30032dabc95725e4fbf561101c345608cc19613 assets/createbigcannons/models/block/unbored_very_small_steel_cannon_layer.json
2aa7fc286f139f7307a6b946fb231a7065469e5e assets/createbigcannons/models/block/very_large_nethersteel_cannon_layer.json
c11911a55ae4ea6b876446d47a797acc28ad8349 assets/createbigcannons/models/block/very_large_steel_cannon_layer.json
9512abeeacd3a6faa1b2078a98caefab776516cd assets/createbigcannons/models/block/very_small_nethersteel_cannon_layer.json
Expand Down Expand Up @@ -268,7 +270,8 @@ dad3b5005bf60bf119e39ed35166bc20a7c504e0 assets/createbigcannons/models/item/unb
de624f1ec37a1da818097b44d6c89ac4eed44e73 assets/createbigcannons/models/item/unbored_steel_sliding_breech.json
a44b0fa2fe9ffe18f958967274446d763454fa82 assets/createbigcannons/models/item/unbored_very_large_nethersteel_cannon_layer.json
558edd9d1185cc28d9d673cf5ccdd4b21eff49ce assets/createbigcannons/models/item/unbored_very_large_steel_cannon_layer.json
3db39dfafae5733d4dcec294eae48ba90282cf9e assets/createbigcannons/models/item/unbored_very_small_cannon_layer.json
fe7fee5b279b4da8e911f0188b780c0f3e045c39 assets/createbigcannons/models/item/unbored_very_small_nethersteel_cannon_layer.json
498f463d4e0c255489bec44c14dfdad5f0b8a2ef assets/createbigcannons/models/item/unbored_very_small_steel_cannon_layer.json
354b3ee4afe2210cce99159774761b4d5e75fbab assets/createbigcannons/models/item/very_large_cast_mould.json
dca719fb593d53732e1e08ac40c57a8c994e62db assets/createbigcannons/models/item/very_large_nethersteel_cannon_layer.json
438f0529ae7eefe08ae0937af3e0c60b81ff5908 assets/createbigcannons/models/item/very_large_steel_cannon_layer.json
Expand Down Expand Up @@ -344,8 +347,8 @@ ea53f3fda677412a898b9bfebc9ffe50427149e8 data/createbigcannons/block_recipes/unb
28e59dd5fbc4497d493ab05754132cf8c605a75f data/createbigcannons/block_recipes/unbored_steel_sliding_breech.json
8ae595524541c9d77161361bd6a3022f8927a8d2 data/createbigcannons/block_recipes/unbored_very_large_nethersteel_cannon_layer.json
9566504c4dfff76030f866d60f5aa41f2a4a48ef data/createbigcannons/block_recipes/unbored_very_large_steel_cannon_layer.json
84ddbaa339157b136b5db939f86590d11035fcf4 data/createbigcannons/block_recipes/unbored_very_small_nethersteel_cannon_layer.json
bf93fbf961a8a12f2a20e70f8eab7e6a3dc98ffb data/createbigcannons/block_recipes/unbored_very_small_steel_cannon_layer.json
e227fde396c8d45976fc5172c7b9394d51de50f1 data/createbigcannons/block_recipes/unbored_very_small_nethersteel_cannon_layer.json
6c141e27ddad56e42e8810cc988e196ae9ccace9 data/createbigcannons/block_recipes/unbored_very_small_steel_cannon_layer.json
9b879889aabb747b89e2688e31df08cc56fe73cc data/createbigcannons/loot_tables/blocks/bag_of_grapeshot.json
b50692690797a173433e005f31e8e13e93285c10 data/createbigcannons/loot_tables/blocks/basin_foundry_lid.json
cf5917fa2b4cbc2303b1a7d954b9e42dcca585e4 data/createbigcannons/loot_tables/blocks/bronze_cannon_barrel.json
Expand Down Expand Up @@ -422,7 +425,8 @@ a27ef217bdba65eb042d10eaece83cc9958e69fe data/createbigcannons/loot_tables/block
cd69541c04f2fb6409bad740685c66b78d39a1e9 data/createbigcannons/loot_tables/blocks/unbored_steel_sliding_breech.json
5fa3259fbff375fc82ef3e7f05d06227fb2d6da1 data/createbigcannons/loot_tables/blocks/unbored_very_large_nethersteel_cannon_layer.json
ef737877dcefd530252bb9ba9066cfc8abf290e7 data/createbigcannons/loot_tables/blocks/unbored_very_large_steel_cannon_layer.json
f0e001340c628330514ef073a520aed7dd7986bc data/createbigcannons/loot_tables/blocks/unbored_very_small_cannon_layer.json
24016a87c12ee4049c5d6598ea4120238cd077e3 data/createbigcannons/loot_tables/blocks/unbored_very_small_nethersteel_cannon_layer.json
9581c9c061e8e08ba8e2fd3820d1fb7655505651 data/createbigcannons/loot_tables/blocks/unbored_very_small_steel_cannon_layer.json
8652f24e42b7ac1d595ec06348d9f2fcad249ed6 data/createbigcannons/loot_tables/blocks/very_large_cast_mould.json
a7fd0e387e5f63069326e3095692d0bd598f1b45 data/createbigcannons/loot_tables/blocks/very_large_nethersteel_cannon_layer.json
92cd389500fdb0883367af0c4dc04ae6af43144f data/createbigcannons/loot_tables/blocks/very_large_steel_cannon_layer.json
Expand Down Expand Up @@ -490,9 +494,9 @@ b97a7996a0bb37412127e096f0216263f1fa3f60 data/createbigcannons/recipes/very_smal
baa2d5efe8f23a3ccf1ccb77c7351e50c9e4c91c data/createbigcannons/recipes/wrought_iron_cannon_chamber.json
3f5f0195f7fc471e74430d456a916478e258f9de data/createbigcannons/recipes/wrought_iron_cannon_end.json
d9037c020abf77853cdcc2efe9336f5885f49dc0 data/createbigcannons/recipes/yaw_controller.json
c924d9f84895ad42b0facae2f6b5762c1cb82ab9 data/createbigcannons/tags/blocks/drill_can_pass_through.json
8dfb1a42a71d43fd125454ad31ad15668d90383d data/createbigcannons/tags/blocks/drill_can_pass_through.json
faa70e3aec3a636293968e1c920c4a48540e7301 data/createbigcannons/tags/blocks/grapeshot_shatterable.json
395528b9f53be749a659bacf9c08d2be211dc300 data/createbigcannons/tags/blocks/reduces_spread.json
6dd8dfa4f73418024c8cf2f2fe6ab3c9ff810a20 data/createbigcannons/tags/blocks/reduces_spread.json
5ff242ddbd7efe3d991a12581f099d6235ffa451 data/createbigcannons/tags/blocks/shrapnel_shatterable.json
48ed49cf671b9edc836e9e83cfdf5f5f0d4100cd data/createbigcannons/tags/blocks/thick_tubing.json
2f94e2e69e36891677a126002ddec0b417444d59 data/createbigcannons/tags/blocks/weak_cannon_end.json
Expand Down Expand Up @@ -523,8 +527,8 @@ f3c9eea77286d0b77399eb90de870b5234006ea6 data/minecraft/recipes/cast_iron_block.
77551557bfda90942eea096985ced62a91e8a774 data/minecraft/recipes/nethersteel_ingot_from_nuggets.json
a144344619878237f41ee3b1f6827a9f81799291 data/minecraft/recipes/nethersteel_nugget.json
04e9a419cbc22122afc37ca777ff7cf0ee7d7c46 data/minecraft/tags/blocks/mineable/axe.json
f70f837c0bf501f16bac957702526695b6c7460a data/minecraft/tags/blocks/mineable/pickaxe.json
55adbfa20c1c24d82789f01303ca11b723418ec3 data/minecraft/tags/blocks/mineable/pickaxe.json
bb423629db5cdb85c080525ca5a1bceb324e0636 data/minecraft/tags/blocks/mineable/shovel.json
d56fbf749216e53e4c2157247f4d3673e8bb8fd9 data/minecraft/tags/blocks/needs_diamond_tool.json
fa9955a69cbaf0990955b04522156cea1d0c6b5d data/minecraft/tags/blocks/needs_iron_tool.json
3f5ca4b26fa4eb4b944741e7d9e1709cb33ea87a data/minecraft/tags/blocks/needs_diamond_tool.json
2c67f96492a53178b961cc9f3226f364011cf7f4 data/minecraft/tags/blocks/needs_iron_tool.json
c76bf42ac6cc17e9d2c833ac9e92d549d96b2ea1 data/minecraft/tags/fluids/water.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"variants": {
"facing=down": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer",
"x": 180
},
"facing=up": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer"
},
"facing=north": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer",
"x": 90
},
"facing=south": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer",
"x": 90,
"y": 180
},
"facing=west": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer",
"x": 90,
"y": 270
},
"facing=east": {
"model": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer",
"x": 90,
"y": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"variants": {
"facing=down": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer",
"x": 180
},
"facing=up": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer"
},
"facing=north": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer",
"x": 90
},
"facing=south": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer",
"x": 90,
"y": 180
},
"facing=west": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer",
"x": 90,
"y": 270
},
"facing=east": {
"model": "createbigcannons:block/unbored_very_small_steel_cannon_layer",
"x": 90,
"y": 90
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
"block.createbigcannons.unbored_steel_sliding_breech": "\u0265\u0254\u01DD\u01DD\u0279\u15FA bu\u0131p\u0131\u05DFS \u05DF\u01DD\u01DD\u0287S p\u01DD\u0279oqu\u2229",
"block.createbigcannons.unbored_very_large_nethersteel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287s\u0279\u01DD\u0265\u0287\u01DDN \u01DDb\u0279\u0250\uA780 \u028E\u0279\u01DD\u039B p\u01DD\u0279oqu\u2229",
"block.createbigcannons.unbored_very_large_steel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287S \u01DDb\u0279\u0250\uA780 \u028E\u0279\u01DD\u039B p\u01DD\u0279oqu\u2229",
"block.createbigcannons.unbored_very_small_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u05DF\u0250\u026FS \u028E\u0279\u01DD\u039B p\u01DD\u0279oqu\u2229",
"block.createbigcannons.unbored_very_small_nethersteel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287s\u0279\u01DD\u0265\u0287\u01DDN \u05DF\u05DF\u0250\u026FS \u028E\u0279\u01DD\u039B p\u01DD\u0279oqu\u2229",
"block.createbigcannons.unbored_very_small_steel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287S \u05DF\u05DF\u0250\u026FS \u028E\u0279\u01DD\u039B p\u01DD\u0279oqu\u2229",
"block.createbigcannons.very_large_cast_mould": "p\u05DFnoW \u0287s\u0250\u0186 \u01DDb\u0279\u0250\uA780 \u028E\u0279\u01DD\u039B",
"block.createbigcannons.very_large_nethersteel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287s\u0279\u01DD\u0265\u0287\u01DDN \u01DDb\u0279\u0250\uA780 \u028E\u0279\u01DD\u039B",
"block.createbigcannons.very_large_steel_cannon_layer": "\u0279\u01DD\u028E\u0250\uA780 uouu\u0250\u0186 \u05DF\u01DD\u01DD\u0287S \u01DDb\u0279\u0250\uA780 \u028E\u0279\u01DD\u039B",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@
"block.createbigcannons.unbored_steel_sliding_breech": "Unbored Steel Sliding Breech",
"block.createbigcannons.unbored_very_large_nethersteel_cannon_layer": "Unbored Very Large Nethersteel Cannon Layer",
"block.createbigcannons.unbored_very_large_steel_cannon_layer": "Unbored Very Large Steel Cannon Layer",
"block.createbigcannons.unbored_very_small_cannon_layer": "Unbored Very Small Cannon Layer",
"block.createbigcannons.unbored_very_small_nethersteel_cannon_layer": "Unbored Very Small Nethersteel Cannon Layer",
"block.createbigcannons.unbored_very_small_steel_cannon_layer": "Unbored Very Small Steel Cannon Layer",
"block.createbigcannons.very_large_cast_mould": "Very Large Cast Mould",
"block.createbigcannons.very_large_nethersteel_cannon_layer": "Very Large Nethersteel Cannon Layer",
"block.createbigcannons.very_large_steel_cannon_layer": "Very Large Steel Cannon Layer",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "createbigcannons:block/cannon_barrel",
"textures": {
"side": "createbigcannons:block/cannon_barrel/steel_cannon_barrel_side",
"end": "createbigcannons:block/cannon_barrel/unbored_steel_cannon_barrel_end",
"particle": "createbigcannons:block/cannon_barrel/steel_cannon_barrel_side"
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "createbigcannons:block/unbored_very_small_nethersteel_cannon_layer"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "createbigcannons:block/unbored_very_small_steel_cannon_layer"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"amount": 1
},
"casting_time": 2400,
"result": "createbigcannons:unbored_very_small_cannon_layer"
"result": "createbigcannons:unbored_very_small_nethersteel_cannon_layer"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"amount": 1
},
"casting_time": 2400,
"result": "createbigcannons:unbored_very_small_cannon_layer"
"result": "createbigcannons:unbored_very_small_steel_cannon_layer"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "createbigcannons:unbored_very_small_nethersteel_cannon_layer"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "createbigcannons:unbored_very_small_cannon_layer"
"name": "createbigcannons:unbored_very_small_steel_cannon_layer"
}
],
"conditions": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"createbigcannons:medium_steel_cannon_layer",
"createbigcannons:large_steel_cannon_layer",
"createbigcannons:very_large_steel_cannon_layer",
"createbigcannons:unbored_very_small_steel_cannon_layer",
"createbigcannons:unbored_small_steel_cannon_layer",
"createbigcannons:unbored_medium_steel_cannon_layer",
"createbigcannons:unbored_large_steel_cannon_layer",
Expand All @@ -40,7 +41,7 @@
"createbigcannons:medium_nethersteel_cannon_layer",
"createbigcannons:large_nethersteel_cannon_layer",
"createbigcannons:very_large_nethersteel_cannon_layer",
"createbigcannons:unbored_very_small_cannon_layer",
"createbigcannons:unbored_very_small_nethersteel_cannon_layer",
"createbigcannons:unbored_small_nethersteel_cannon_layer",
"createbigcannons:unbored_medium_nethersteel_cannon_layer",
"createbigcannons:unbored_large_nethersteel_cannon_layer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
"createbigcannons:unbored_bronze_cannon_barrel",
"createbigcannons:steel_cannon_barrel",
"createbigcannons:built_up_steel_cannon_barrel",
"createbigcannons:unbored_very_small_steel_cannon_layer",
"createbigcannons:nethersteel_cannon_barrel",
"createbigcannons:built_up_nethersteel_cannon_barrel",
"createbigcannons:unbored_very_small_cannon_layer"
"createbigcannons:unbored_very_small_nethersteel_cannon_layer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"createbigcannons:medium_steel_cannon_layer",
"createbigcannons:large_steel_cannon_layer",
"createbigcannons:very_large_steel_cannon_layer",
"createbigcannons:unbored_very_small_steel_cannon_layer",
"createbigcannons:unbored_small_steel_cannon_layer",
"createbigcannons:unbored_medium_steel_cannon_layer",
"createbigcannons:unbored_large_steel_cannon_layer",
Expand All @@ -49,7 +50,7 @@
"createbigcannons:medium_nethersteel_cannon_layer",
"createbigcannons:large_nethersteel_cannon_layer",
"createbigcannons:very_large_nethersteel_cannon_layer",
"createbigcannons:unbored_very_small_cannon_layer",
"createbigcannons:unbored_very_small_nethersteel_cannon_layer",
"createbigcannons:unbored_small_nethersteel_cannon_layer",
"createbigcannons:unbored_medium_nethersteel_cannon_layer",
"createbigcannons:unbored_large_nethersteel_cannon_layer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"createbigcannons:medium_nethersteel_cannon_layer",
"createbigcannons:large_nethersteel_cannon_layer",
"createbigcannons:very_large_nethersteel_cannon_layer",
"createbigcannons:unbored_very_small_cannon_layer",
"createbigcannons:unbored_very_small_nethersteel_cannon_layer",
"createbigcannons:unbored_small_nethersteel_cannon_layer",
"createbigcannons:unbored_medium_nethersteel_cannon_layer",
"createbigcannons:unbored_large_nethersteel_cannon_layer",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"createbigcannons:medium_steel_cannon_layer",
"createbigcannons:large_steel_cannon_layer",
"createbigcannons:very_large_steel_cannon_layer",
"createbigcannons:unbored_very_small_steel_cannon_layer",
"createbigcannons:unbored_small_steel_cannon_layer",
"createbigcannons:unbored_medium_steel_cannon_layer",
"createbigcannons:unbored_large_steel_cannon_layer",
Expand Down
Loading

0 comments on commit addf8c8

Please sign in to comment.