Skip to content

Commit

Permalink
Reworked FuSticker
Browse files Browse the repository at this point in the history
  • Loading branch information
Cloud authored and LeoLezury committed Nov 23, 2024
1 parent f2354bb commit 07344e7
Show file tree
Hide file tree
Showing 41 changed files with 399 additions and 392 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
// 1.21 2024-07-26T18:16:26.7838952 Loot Tables
// 1.21 2024-09-12T18:45:34.2370559 Loot Tables
f16854500c1fe7c108a688f323b1d43ec314c7f0 data/celebrations/loot_table/blocks/chinese_styled_bamboo_lantern.json
60535fb769799b40c4ad680dd775157ca407c7b3 data/celebrations/loot_table/blocks/chinese_styled_paper_lantern.json
14e52a830878533cee7bb9e1f7ffb84503fd8f53 data/celebrations/loot_table/blocks/chinese_styled_red_lantern.json
b910e52f91ffe128a4d94c37b61fb699c992079a data/celebrations/loot_table/blocks/couplet.json
059de9e97efaf67a9c0bd18a1ebb34ab7f58a11e data/celebrations/loot_table/blocks/firework_bundle.json
971df10048a8d60c26e5c0ee42d229ef9fe12c47 data/celebrations/loot_table/blocks/fu_sticker.json
fb43c8227c2caaeb32bd595007ca5dbc85a20b13 data/celebrations/loot_table/blocks/golden_fu_sticker.json
05323398e49fa2c42e3589eb3aa39b6234a18484 data/celebrations/loot_table/blocks/horizontal_scroll.json
659862e733b216796c14e7c3e02dac19874b8a5a data/celebrations/loot_table/blocks/inverted_fu_sticker.json
e1e48f5b29801955968898e511e4dd098c069f22 data/celebrations/loot_table/blocks/inverted_golden_fu_sticker.json
f615d7c82e77b608ba0a3b8e87b4cc2b895d2446 data/celebrations/loot_table/blocks/japanese_styled_paper_lantern.json
7b5266b8253cdeddf9c4f7ebbffd74c2ad5826bb data/celebrations/loot_table/blocks/japanese_styled_red_lantern.json
960e8fd76f6ff7f261b2103a5c2c9fe81e18f38a data/celebrations/loot_table/gameplay/villager_gift.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
// 1.21 2024-07-25T16:52:36.2119642 Block States: celebrations
// 1.21 2024-09-12T18:45:34.2444271 Block States: celebrations
e146236a6c2d3384be861f1842756c426aec2e26 assets/celebrations/blockstates/chinese_styled_bamboo_lantern.json
804ab30c8c046a45e094f74286778fdd662eb1f6 assets/celebrations/blockstates/chinese_styled_paper_lantern.json
e56ec6c676272fde86dac556bd923511620b61f9 assets/celebrations/blockstates/chinese_styled_red_lantern.json
52c6d9067391f70ddf223e148f958493d7774c9d assets/celebrations/blockstates/couplet.json
854f2516f0ff34f5cf762271d38503f2576b5c7d assets/celebrations/blockstates/firework_bundle.json
6d0411bd38766b0a197a3c61a16a3bb84fc80370 assets/celebrations/blockstates/fu_sticker.json
7661b55372bc3695130c08387799f5d93fc682fd assets/celebrations/blockstates/golden_fu_sticker.json
35212d3f6fb8e37a67f965d4f07cbc84ecb80ceb assets/celebrations/blockstates/horizontal_scroll.json
12f1548467a762a9b77ff2a1e25a958c835b483d assets/celebrations/blockstates/inverted_fu_sticker.json
b05580ac75edca3a3cc59a45638f7b41e2ba5c83 assets/celebrations/blockstates/inverted_golden_fu_sticker.json
a440fe568f7dee45c927db6c354ded828d589783 assets/celebrations/blockstates/japanese_styled_paper_lantern.json
2a8c21100e2db463ca8ce409ec4cbac5aab03ae8 assets/celebrations/blockstates/japanese_styled_red_lantern.json
10bf1bfa57f9c0c54437e19dee2ce0c0323a668c assets/celebrations/models/block/couplet.json
603de5cd4a90142720ec9f6eaf8509a1fbce30c9 assets/celebrations/models/block/firework_bundle.json
0b571e8a0832fc7dd1f1a295d6bcc94487b15728 assets/celebrations/models/block/fu_sticker.json
bed44ffe58c8f27ca4140d754aa9a1591bafb4c0 assets/celebrations/models/block/golden_fu_sticker.json
044cbb26bb86e77119b0f4cdee3ebdbedbf72838 assets/celebrations/models/block/horizontal_scroll.json
b3dd98a9e4b2842f7f8d2c334e950148c61a4b12 assets/celebrations/models/block/inverted_fu_sticker.json
810ee22bda95f45e489cacd549648a2e9a369d8e assets/celebrations/models/block/inverted_golden_fu_sticker.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-08-31T20:50:35.7179308 Languages: zh_cn for mod: celebrations
3ccff4f74ebb1700a8e119a2e5bbd87eaa20a7fb assets/celebrations/lang/zh_cn.json
// 1.21 2024-09-12T18:45:34.2370559 Languages: zh_cn for mod: celebrations
381dd4339713a7cf26b187a0d9cbadeb276ce77d assets/celebrations/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-08-31T20:50:35.7179308 Languages: en_us for mod: celebrations
43f1aa404e8ae53e01195d659f596b2e9f695869 assets/celebrations/lang/en_us.json
// 1.21 2024-09-12T18:45:34.2370559 Languages: en_us for mod: celebrations
0cd6cb72ba709f8e948dbd553835e532323d5287 assets/celebrations/lang/en_us.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 5 additions & 4 deletions src/generated/resources/assets/celebrations/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
"block.celebrations.chinese_styled_red_lantern": "Chinese Styled Red Lantern",
"block.celebrations.couplet": "Couplet",
"block.celebrations.firework_bundle": "Firework Bundle",
"block.celebrations.fu_sticker": "Fu Sticker",
"block.celebrations.golden_fu_sticker": "Golden Fu Sticker",
"block.celebrations.horizontal_scroll": "Horizontal Scroll",
"block.celebrations.inverted_fu_sticker": "Inverted Fu Sticker",
"block.celebrations.inverted_golden_fu_sticker": "Inverted Golden Fu Sticker",
"block.celebrations.japanese_styled_paper_lantern": "Japanese Styled Paper Lantern",
"block.celebrations.japanese_styled_red_lantern": "Japanese Styled Red Lantern",
"celebrations.configuration.celebration": "Celebrations",
Expand All @@ -21,9 +17,14 @@
"celebrations.configuration.lanternGiveNonEnemyBeneficialEffect": "Lanterns Give Non-enemy Mobs Beneficial Effects",
"celebrations.configuration.lanternGiveNonEnemyHarmfulEffect": "Lanterns Give Non-enemy Mobs Harmful Effects",
"entity.celebrations.balloon": "Balloon",
"entity.celebrations.fu_sticker": "Fu Sticker",
"fml.menu.mods.info.description.celebrations": "A mod about celebrating!",
"item.celebrations.balloon": "Balloon",
"item.celebrations.fu_sticker": "Fu Sticker",
"item.celebrations.gold_powder": "Gold Powder",
"item.celebrations.golden_fu_sticker": "Golden Fu Sticker",
"item.celebrations.inverted_fu_sticker": "Inverted Fu Sticker",
"item.celebrations.inverted_golden_fu_sticker": "Inverted Golden Fu Sticker",
"item.celebrations.party_hat": "Party Hat",
"item.celebrations.red_paper": "Red Paper",
"message.celebrations.cannot_ignite_due_to_gift": "This lantern contains a gift and cannot be lit now",
Expand Down
9 changes: 5 additions & 4 deletions src/generated/resources/assets/celebrations/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
"block.celebrations.chinese_styled_red_lantern": "中式红灯笼",
"block.celebrations.couplet": "对联",
"block.celebrations.firework_bundle": "烟花桶",
"block.celebrations.fu_sticker": "福字",
"block.celebrations.golden_fu_sticker": "金色福字",
"block.celebrations.horizontal_scroll": "横批",
"block.celebrations.inverted_fu_sticker": "倒福字",
"block.celebrations.inverted_golden_fu_sticker": "金色倒福字",
"block.celebrations.japanese_styled_paper_lantern": "日式纸灯笼",
"block.celebrations.japanese_styled_red_lantern": "日式红灯笼",
"celebrations.configuration.celebration": "庆祝",
Expand All @@ -21,9 +17,14 @@
"celebrations.configuration.lanternGiveNonEnemyBeneficialEffect": "灯笼给予非敌对生物增益效果",
"celebrations.configuration.lanternGiveNonEnemyHarmfulEffect": "灯笼给予非敌对生物负面效果",
"entity.celebrations.balloon": "气球",
"entity.celebrations.fu_sticker": "福字",
"fml.menu.mods.info.description.celebrations": "一个关于庆祝的模组!",
"item.celebrations.balloon": "气球",
"item.celebrations.fu_sticker": "福字",
"item.celebrations.gold_powder": "金粉",
"item.celebrations.golden_fu_sticker": "金色福字",
"item.celebrations.inverted_fu_sticker": "倒福字",
"item.celebrations.inverted_golden_fu_sticker": "金色倒福字",
"item.celebrations.party_hat": "派对帽",
"item.celebrations.red_paper": "红纸",
"message.celebrations.cannot_ignite_due_to_gift": "这盏灯笼装有礼物,现在无法点燃",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

113 changes: 0 additions & 113 deletions src/main/java/team/leomc/celebrations/block/FuStickerBlock.java

This file was deleted.

This file was deleted.

Loading

0 comments on commit 07344e7

Please sign in to comment.