diff --git a/dev/resources/textures/fish_singularity.psd b/dev/resources/textures/fish_singularity.psd new file mode 100644 index 000000000..08baf019f Binary files /dev/null and b/dev/resources/textures/fish_singularity.psd differ diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index b21330af5..70d676b3f 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -185,6 +185,7 @@ tile.contenttweaker.silicon_block.name=Silicon Block item.contenttweaker.knowledge_absorber.name=Knowledge Absorber item.contenttweaker.woodweave_singularity.name=§cWoodweave Singularity +item.contenttweaker.fish_singularity.name=§3Fish Singularity item.contenttweaker.supremium_boots_base.name=Supremium Boots Core Base item.contenttweaker.supremium_chest_base.name=Supremium Chestplate Core Base item.contenttweaker.supremium_helmet_base.name=Supremium Helmet Core Base diff --git a/resources/contenttweaker/lang/ru_ru.lang b/resources/contenttweaker/lang/ru_ru.lang index ebf9adf85..bb9091087 100644 --- a/resources/contenttweaker/lang/ru_ru.lang +++ b/resources/contenttweaker/lang/ru_ru.lang @@ -185,6 +185,7 @@ tile.contenttweaker.silicon_block.name=Силиконовый блок item.contenttweaker.knowledge_absorber.name=Поглотитель Знаний item.contenttweaker.woodweave_singularity.name=§cДревоплетённая Сингулярность +item.contenttweaker.fish_singularity.name=§3Рыбная Сингулярность item.contenttweaker.supremium_boots_base.name=Основание Ядра Супремиумных Ботинок item.contenttweaker.supremium_chest_base.name=Основание Ядра Супремиумного Нагрудника item.contenttweaker.supremium_helmet_base.name=Основание Ядра Супремиумного Шлема diff --git a/resources/contenttweaker/lang/zh_cn.lang b/resources/contenttweaker/lang/zh_cn.lang index 8b487cc34..115571310 100644 --- a/resources/contenttweaker/lang/zh_cn.lang +++ b/resources/contenttweaker/lang/zh_cn.lang @@ -185,6 +185,7 @@ tile.contenttweaker.silicon_block.name=硅块 item.contenttweaker.knowledge_absorber.name=知识吸收器 item.contenttweaker.woodweave_singularity.name=§c木纹奇点 +item.contenttweaker.fish_singularity.name=§3鱼类奇点 item.contenttweaker.supremium_boots_base.name=终极精华靴子核心基底 item.contenttweaker.supremium_chest_base.name=终极精华胸甲核心基底 item.contenttweaker.supremium_helmet_base.name=终极精华头盔核心基底 diff --git a/resources/contenttweaker/textures/items/fish_singularity.png b/resources/contenttweaker/textures/items/fish_singularity.png new file mode 100644 index 000000000..01da61311 Binary files /dev/null and b/resources/contenttweaker/textures/items/fish_singularity.png differ diff --git a/resources/contenttweaker/textures/items/fish_singularity.png.mcmeta b/resources/contenttweaker/textures/items/fish_singularity.png.mcmeta new file mode 100644 index 000000000..b38b9cba7 --- /dev/null +++ b/resources/contenttweaker/textures/items/fish_singularity.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/resources/contenttweaker/textures/items/fish_singularity_overlay.png b/resources/contenttweaker/textures/items/fish_singularity_overlay.png new file mode 100644 index 000000000..86d373e97 Binary files /dev/null and b/resources/contenttweaker/textures/items/fish_singularity_overlay.png differ diff --git a/resources/contenttweaker/textures/items/fish_singularity_overlay.png.mcmeta b/resources/contenttweaker/textures/items/fish_singularity_overlay.png.mcmeta new file mode 100644 index 000000000..b327019fa --- /dev/null +++ b/resources/contenttweaker/textures/items/fish_singularity_overlay.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/scripts/cot/init.zs b/scripts/cot/init.zs index 8a51eda1a..0c5e1047c 100644 --- a/scripts/cot/init.zs +++ b/scripts/cot/init.zs @@ -66,6 +66,12 @@ x.noRepair = true; // x.attackDamage = 0; x.register(); +x = VanillaFactory.createExpandItem('fish_singularity'); +x.creativeTab = ; +x.maxDamage = 30000; +x.noRepair = true; +x.register(); + createBlockStone('compressed_skystone', 6, ); createBlockStone('compressed_andesite', 4, ); createBlockStone('compressed_diorite', 4, ); diff --git a/scripts/cot/recipes.zs b/scripts/cot/recipes.zs index 9e50c980d..9592594ec 100644 --- a/scripts/cot/recipes.zs +++ b/scripts/cot/recipes.zs @@ -207,6 +207,15 @@ scripts.do.diverse.addRecipe( ); +needPowerStr = mods.zenutils.StaticString.format('%,d', .maxDamage).replaceAll(',', '§8,§6'); +scripts.lib.tooltip.desc.jei(, 'singularity.fish', needPowerStr); +scripts.do.diverse.addRecipe( + 'Fish Singularity', + , + , + +); + // ------------------------------------------------------------------- /*