Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Magic Apiary Texture Rework + Fix Research #32

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/magicbees/client/gui/GuiMagicApiary.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ public class GuiMagicApiary extends GuiContainer {
private static final int WORKBOOST_SRC_X = 176;
private static final int WORKBOOST_SRC_Y = 46;

private static final int DEATHBOOST_WIDTH = 11;
private static final int DEATHBOOST_WIDTH = 13;
private static final int DEATHBOOST_HEIGHT = 13;
private static final int DEATHBOOST_DEST_X = 25;
private static final int DEATHBOOST_DEST_Y = 17;
private static final int DEATHBOOST_SRC_X = 176;
private static final int DEATHBOOST_SRC_Y = 58;

private static final int MUTATIONBOOST_WIDTH = 9;
private static final int MUTATIONBOOST_WIDTH = 10;
private static final int MUTATIONBOOST_HEIGHT = 13;
private static final int MUTATIONBOOST_DEST_X = 15;
private static final int MUTATIONBOOST_DEST_Y = 17;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ private static void setupResearch() {
1,
1,
new ItemStack(Config.hiveFrameMagic))
.setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe) frameMagic))
.setPages(getResearchPage("MB_FrameMagic.1"), new ResearchPage((IArcaneRecipe) frameMagic))
.registerResearchItem();

input = new ItemStack(Config.hiveFrameMagic);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/magicbees/lang/de_DE.lang
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ tc.research_page.MB_EssenceLife.1=Einfach zu kreieren, durch Magie, hat diese Es

tc.research_name.MB_EssenceDeath=Essenz eines Flachen Grabes
tc.research_text.MB_EssenceDeath=[MB] Nicht ganz tot.
tc.reseacrh_page.MB_EssenceDeath.1=Die Essenz eines Flachen Grabes bündelt den Tod vieler... "natürlicher" Kreaturen, die die Welt bewandern: Zombies, Skelette, all solche Wesen. Wenn du Bienen dieser Energie aussetzt, werden sie langsam und träge, und ihre Lebensdauer sinkt. Einige Apimanten denken, das Nutzen von mit dieser Essenz erfüllten Rähmchen wäre grausam, jedoch sehen andere es als natürlichen Teil normaler Bienenzucht, dabei bestrebt, ihre perfekte Sorte Bienen irgendwann innerhalb IHRER Lebenszeit zu kreieren. <BR> Die Gilde der Sicherheit der Apimanten empfiehlt Umgang mit Telekinese oder einer sehr langen Zange.
tc.research_page.MB_EssenceDeath.1=Die Essenz eines Flachen Grabes bündelt den Tod vieler... "natürlicher" Kreaturen, die die Welt bewandern: Zombies, Skelette, all solche Wesen. Wenn du Bienen dieser Energie aussetzt, werden sie langsam und träge, und ihre Lebensdauer sinkt. Einige Apimanten denken, das Nutzen von mit dieser Essenz erfüllten Rähmchen wäre grausam, jedoch sehen andere es als natürlichen Teil normaler Bienenzucht, dabei bestrebt, ihre perfekte Sorte Bienen irgendwann innerhalb IHRER Lebenszeit zu kreieren. <BR> Die Gilde der Sicherheit der Apimanten empfiehlt Umgang mit Telekinese oder einer sehr langen Zange.

tc.research_name.MB_EssenceArmor=Essenz der Immerwährenden Haltbarkeit
tc.research_text.MB_EssenceArmor=[MB] The rubber to your glue
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/magicbees/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ tc.research_page.MB_EssenceLife.1=Simple to create by means of magic, this essen

tc.research_name.MB_EssenceDeath=Essence of a Shallow Grave
tc.research_text.MB_EssenceDeath=Not quite six feet under.
tc.reseacrh_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.
tc.research_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.

tc.research_name.MB_EssenceArmor=Essence of Everlasting Durability
tc.research_text.MB_EssenceArmor=The rubber to your glue
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/magicbees/lang/ru_RU.lang
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ tc.research_page.MB_EssenceLife.1=Simple to create by means of magic, this essen

tc.research_name.MB_EssenceDeath=Эссенция неглубокой могилы
tc.research_text.MB_EssenceDeath=[MB] Не совсем шесть футов под килем.
tc.reseacrh_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.
tc.research_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.

tc.research_name.MB_EssenceArmor=Эссенция вечной прочности
tc.research_text.MB_EssenceArmor=[MB] Резина для Вашего клея
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/magicbees/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ tc.research_page.MB_EssenceLife.1=由魔力所创造,这种源质在暴露在蜜

tc.research_name.MB_EssenceDeath=暗影之墓源质
tc.research_text.MB_EssenceDeath=[MB] 离地六英尺不足.
tc.reseacrh_page.MB_EssenceDeath.1=暗影之墓源质引导着无数游荡于这个世界的..."自然"生物,走向死亡:僵尸, 骷髅, 诸如此类.暴露于这种能量下的蜜蜂会越来越迟缓, 寿命也会随之缩短.一部分神秘养蜂家认为使用浸有此种源质的框架是一种十分残忍的行为,然而, 也有其他观点认为这是常规养蜂中不可避免的一部分, 有时还可以让那些蜜蜂们在它们有限的生命周期里紧张工作起来.<BR> 神秘养蜂学安全指南章程中建议使用念力或者特别长的钳子来拿取此框架.
tc.research_page.MB_EssenceDeath.1=暗影之墓源质引导着无数游荡于这个世界的..."自然"生物,走向死亡:僵尸, 骷髅, 诸如此类.暴露于这种能量下的蜜蜂会越来越迟缓, 寿命也会随之缩短.一部分神秘养蜂家认为使用浸有此种源质的框架是一种十分残忍的行为,然而, 也有其他观点认为这是常规养蜂中不可避免的一部分, 有时还可以让那些蜜蜂们在它们有限的生命周期里紧张工作起来.<BR> 神秘养蜂学安全指南章程中建议使用念力或者特别长的钳子来拿取此框架.

tc.research_name.MB_EssenceArmor=恒久不灭源质
tc.research_text.MB_EssenceArmor=[MB] 你胶水上的橡胶
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/magicbees/lang/zh_TW.lang
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ tc.research_page.MB_EssenceLife.1=Simple to create by means of magic, this essen

tc.research_name.MB_EssenceDeath=暗影之墓源質
tc.research_text.MB_EssenceDeath=[MB] Not quite six feet under.
tc.reseacrh_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.
tc.research_page.MB_EssenceDeath.1=The Essence of a Shallow Grave channels the death of many of the ... "natural" creatures that wander the world: Zombies, Skeletons, those sorts of things. Exposing bees to this energy has the effect of making them slow and sluggish, and curtails the extent of their lifespan. Some Apimancers consider using frames imbued with these Essences to be cruel, however, others view it as a natrual part of normal beekeeping, with an eye to creating their perfect strain of bees sometime within THEIR lifetime. <BR> The Apimancer's Guild of Safety recommends handling them with telekenisis or very long tongs.

tc.research_name.MB_EssenceArmor=恆久不滅源質
tc.research_text.MB_EssenceArmor=[MB] The rubber to your glue
Expand Down
Binary file modified src/main/resources/assets/magicbees/textures/gui/apiary.png

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a mixture is nice. (gui saty icons changed) The new icons much cleaner expain where they stand for

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a mixture is nice. (gui saty icons changed) The new icons much cleaner expain where they stand for

I'm strongly against any change in this specific case, Magic Bees has a very unique style of design, and any removal from that is a downright tragedy, the icons as they are fit perfectly into the style Magic Bees has portrayed within the entirety of itself, and if you've done the mod, you understand what the icons mean.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if he wants to put a proper side by side, he's free to do so, no PR that changes icons should be passed if they don't even at the very least do that

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure lets hear more people on this

Copy link

@Alastors Alastors Oct 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apiary1
besides are you telling me this

makes less sense than this:
apiary2

They're both downright nonsensical, so it literally doesn't matter if they're "more readable" because they're both downright unreadable, a change just strips identity for 0 gain.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Magic ain't technology no matter what some old sci-fi authors say. I say unique GUIs for the magical things is nice.

A gregtech style GUI should be for the beecompressor9000™ or some other technological disaster, not magic,

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.