tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Button split

Browse source 
- Replace project page button with separate CurseForge and Modrinth
buttons
- Add null check to mc.gameMode in ToolboxHandlerClient.onKeyInput
This commit is contained in:
PepperCode1 2022-07-11 14:08:44 -07:00
parent 9e8b278398
commit 2508d1da25
26 changed files with 66 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View file

@ -49,6 +49,7 @@ body:
label: Mod Version
description: The version of the mod you were using when the bug occured
options:
- "0.5.0a"
- "0.5.0"
- "0.4.1"
- "0.4.0f"

32
src/generated/resources/.cache/cache
View file

@ -559,22 +559,22 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json
7bf329d0e72e8262525335e8dc24b25d876abe16 assets/create/lang/en_us.json
cc4ad2cab36c5545e9033d877fff0dc72b55aad3 assets/create/lang/unfinished/de_de.json
c4e07a8e6bfa28cb280d95f8600f6873fafe078f assets/create/lang/unfinished/es_cl.json
c1a4222a108fb10f4900f4ea4ce5c762d04f4917 assets/create/lang/unfinished/es_es.json
6a1a568f4f84a80f4338a858a3147173604a4ea6 assets/create/lang/unfinished/fr_fr.json
b36117021a8b4c431351079cf22a16958cb6f5f9 assets/create/lang/unfinished/it_it.json
af401cde90e194ecb384f8091041fbb232e6672f assets/create/lang/unfinished/ja_jp.json
5d87b8a918076da4fbc74cbea3d96aff7549f3cf assets/create/lang/unfinished/ko_kr.json
fb68a89d423ef73d9204e6d75b7e2b3ae21daad7 assets/create/lang/unfinished/nl_nl.json
65d04135f46e435a7d20b58dc24fc374a091cd85 assets/create/lang/unfinished/pl_pl.json
9cc304bfe85f01592077a84135962d8478999384 assets/create/lang/unfinished/pt_br.json
1252dc9c586fd55e80cd838aeb60932fc29c4e92 assets/create/lang/unfinished/pt_pt.json
42d9d2510ee559254fe6683c7ac07c6a018820c0 assets/create/lang/unfinished/ro_ro.json
ad92bbff37632e230d1736cf2be1220dcef8dc19 assets/create/lang/unfinished/ru_ru.json
e4da496b24c1fa434e9ed43dfa5c8945446dd5a2 assets/create/lang/unfinished/zh_cn.json
9756888c28dbc5358b4a80bdb7f85a9cafffa53e assets/create/lang/unfinished/zh_tw.json
0912780ccfaa354b7e087bbba6566e9b9a671532 assets/create/lang/en_us.json
2e8f7904ef8505d4801f5ca6f49dc0f02abd4dfe assets/create/lang/unfinished/de_de.json
88c44f31d872f8c81e1bacc87723f2f5dcc9223b assets/create/lang/unfinished/es_cl.json
8297f8bd9645fa5164f771186045008322bdb09b assets/create/lang/unfinished/es_es.json
3f15c1c88813587118eeb6d8924bd5ca4740c3c5 assets/create/lang/unfinished/fr_fr.json
988f0a32fe31ab650b954dc4e79019a8f9c62817 assets/create/lang/unfinished/it_it.json
f55115e4346dbcb621d13cd0507f513e800cb1dd assets/create/lang/unfinished/ja_jp.json
e5aa8d44679a9f9e9834dd0035e83e4afb6880f9 assets/create/lang/unfinished/ko_kr.json
71baa135eabfc47c6ea0c91c228de5ba75cb0ab0 assets/create/lang/unfinished/nl_nl.json
978c4f49816e89e00c9f52d6adc6d8c28e07f444 assets/create/lang/unfinished/pl_pl.json
e5f41a077f9e43fcc9703766df83ceee8f3f9408 assets/create/lang/unfinished/pt_br.json
bc235c04748b43160b62400dee47713d98b97093 assets/create/lang/unfinished/pt_pt.json
ac1f0cd7fa76ebcbc3020b82c4d93716a98c225c assets/create/lang/unfinished/ro_ro.json
f4cce36c92c3c776e190c82b99e5b4ed8930c835 assets/create/lang/unfinished/ru_ru.json
c10de552797c819ed686aa9ec345f34c8424a007 assets/create/lang/unfinished/zh_cn.json
82adbce8f58913d07a5d3545ddd40873340ae406 assets/create/lang/unfinished/zh_tw.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json

1
src/generated/resources/assets/create/lang/en_us.json
View file

@ -883,7 +883,6 @@
"create.menu.configure": "Configure...",
"create.menu.ponder_index": "Ponder Index",
"create.menu.only_ingame": "Available in the Pause Menu",
"create.menu.project_page": "Project Page",
"create.menu.report_bugs": "Report Issues",
"create.menu.support": "Support Us",

1
src/generated/resources/assets/create/lang/unfinished/de_de.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Konfigurieren...",
"create.menu.ponder_index": "Ponder-Verzeichnis",
"create.menu.only_ingame": "Im Pause-Menü verfügbar",
"create.menu.project_page": "Projektseite",
"create.menu.report_bugs": "Fehler melden",
"create.menu.support": "Unterstütze uns",

1
src/generated/resources/assets/create/lang/unfinished/es_cl.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Configurar...",
"create.menu.ponder_index": "Reflexionar el índice",
"create.menu.only_ingame": "Disponible en el menú de pausa",
"create.menu.project_page": "Página del Proyecto",
"create.menu.report_bugs": "Reportar Problemas",
"create.menu.support": "Apóyanos",

1
src/generated/resources/assets/create/lang/unfinished/es_es.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Configurar...",
"create.menu.ponder_index": "Índice",
"create.menu.only_ingame": "Disponible en el menú de pausa",
"create.menu.project_page": "Página del proyecto",
"create.menu.report_bugs": "Reportar problemas",
"create.menu.support": "Apóyenos",

3
src/generated/resources/assets/create/lang/unfinished/fr_fr.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 2132",
"_": "Missing Localizations: 2131",
"_": "->------------------------] Game Elements [------------------------<-",
@ -884,7 +884,6 @@
"create.menu.configure": "UNLOCALIZED: Configure...",
"create.menu.ponder_index": "UNLOCALIZED: Ponder Index",
"create.menu.only_ingame": "UNLOCALIZED: Available in the Pause Menu",
"create.menu.project_page": "UNLOCALIZED: Project Page",
"create.menu.report_bugs": "UNLOCALIZED: Report Issues",
"create.menu.support": "UNLOCALIZED: Support Us",

3
src/generated/resources/assets/create/lang/unfinished/it_it.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1903",
"_": "Missing Localizations: 1902",
"_": "->------------------------] Game Elements [------------------------<-",
@ -884,7 +884,6 @@
"create.menu.configure": "UNLOCALIZED: Configure...",
"create.menu.ponder_index": "UNLOCALIZED: Ponder Index",
"create.menu.only_ingame": "UNLOCALIZED: Available in the Pause Menu",
"create.menu.project_page": "UNLOCALIZED: Project Page",
"create.menu.report_bugs": "UNLOCALIZED: Report Issues",
"create.menu.support": "UNLOCALIZED: Support Us",

1
src/generated/resources/assets/create/lang/unfinished/ja_jp.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "設定...",
"create.menu.ponder_index": "思案目次",
"create.menu.only_ingame": "一時停止メニューで利用可能",
"create.menu.project_page": "プロジェクトページ",
"create.menu.report_bugs": "バグ報告",
"create.menu.support": "私たちを応援する",

1
src/generated/resources/assets/create/lang/unfinished/ko_kr.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "설정...",
"create.menu.ponder_index": "분석 메뉴",
"create.menu.only_ingame": "일시 정지 메뉴에서 가능합니다",
"create.menu.project_page": "Curseforge 페이지",
"create.menu.report_bugs": "버그 제보하기",
"create.menu.support": "후원하기",

3
src/generated/resources/assets/create/lang/unfinished/nl_nl.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 2480",
"_": "Missing Localizations: 2479",
"_": "->------------------------] Game Elements [------------------------<-",
@ -884,7 +884,6 @@
"create.menu.configure": "UNLOCALIZED: Configure...",
"create.menu.ponder_index": "UNLOCALIZED: Ponder Index",
"create.menu.only_ingame": "UNLOCALIZED: Available in the Pause Menu",
"create.menu.project_page": "UNLOCALIZED: Project Page",
"create.menu.report_bugs": "UNLOCALIZED: Report Issues",
"create.menu.support": "UNLOCALIZED: Support Us",

1
src/generated/resources/assets/create/lang/unfinished/pl_pl.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Konfiguracja...",
"create.menu.ponder_index": "Katalog analiz",
"create.menu.only_ingame": "Dostępne w menu gry",
"create.menu.project_page": "Strona projektu",
"create.menu.report_bugs": "Zgłoś błąd",
"create.menu.support": "Wesprzyj nas",

1
src/generated/resources/assets/create/lang/unfinished/pt_br.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Configurar...",
"create.menu.ponder_index": "Tabela do ponderamento",
"create.menu.only_ingame": "Disponível no menu de pausa",
"create.menu.project_page": "Página do projeto",
"create.menu.report_bugs": "Informar um erro",
"create.menu.support": "Suporte nós",

3
src/generated/resources/assets/create/lang/unfinished/pt_pt.json
View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 2189",
"_": "Missing Localizations: 2188",
"_": "->------------------------] Game Elements [------------------------<-",
@ -884,7 +884,6 @@
"create.menu.configure": "UNLOCALIZED: Configure...",
"create.menu.ponder_index": "UNLOCALIZED: Ponder Index",
"create.menu.only_ingame": "UNLOCALIZED: Available in the Pause Menu",
"create.menu.project_page": "UNLOCALIZED: Project Page",
"create.menu.report_bugs": "UNLOCALIZED: Report Issues",
"create.menu.support": "UNLOCALIZED: Support Us",

1
src/generated/resources/assets/create/lang/unfinished/ro_ro.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Configurează...",
"create.menu.ponder_index": "Indecele de Chibzuire",
"create.menu.only_ingame": "Valabil în Meniul Jocului",
"create.menu.project_page": "Pagina de Proiect",
"create.menu.report_bugs": "Raportează Probleme",
"create.menu.support": "Susține-ne",

1
src/generated/resources/assets/create/lang/unfinished/ru_ru.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "Настроить...",
"create.menu.ponder_index": "Все размышления",
"create.menu.only_ingame": "Доступно в меню Паузы",
"create.menu.project_page": "Страница проекта",
"create.menu.report_bugs": "Нашли ошибку?",
"create.menu.support": "Поддержите нас",

1
src/generated/resources/assets/create/lang/unfinished/zh_cn.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "配置……",
"create.menu.ponder_index": "思索索引",
"create.menu.only_ingame": "仅在游戏内暂停菜单中可用",
"create.menu.project_page": "项目主页",
"create.menu.report_bugs": "报告问题",
"create.menu.support": "支持我们",

1
src/generated/resources/assets/create/lang/unfinished/zh_tw.json
View file

@ -884,7 +884,6 @@
"create.menu.configure": "設定",
"create.menu.ponder_index": "示範目錄",
"create.menu.only_ingame": "UNLOCALIZED: Available in the Pause Menu",
"create.menu.project_page": "專案頁面",
"create.menu.report_bugs": "回報問題",
"create.menu.support": "支持我們",

2
src/main/java/com/simibubi/create/Create.java
View file

@ -64,7 +64,7 @@ public class Create {
public static final String ID = "create";
public static final String NAME = "Create";
public static final String VERSION = "0.5-unstable";
public static final String VERSION = "0.5a";
public static final Logger LOGGER = LogManager.getLogger();

2
src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java
View file

@ -103,7 +103,7 @@ public class ToolboxHandlerClient {
public static void onKeyInput(int key, boolean pressed) {
Minecraft mc = Minecraft.getInstance();
if (mc.gameMode.getPlayerMode() == GameType.SPECTATOR)
if (mc.gameMode == null || mc.gameMode.getPlayerMode() == GameType.SPECTATOR)
return;
if (key != AllKeys.TOOLBELT.getBoundCode())

5
src/main/java/com/simibubi/create/foundation/config/ui/OpenCreateMenuButton.java
View file

@ -36,10 +36,7 @@ public class OpenCreateMenuButton extends Button {
}
@Override
public void render(PoseStack mstack, int mouseX, int mouseY, float pticks) {
super.render(mstack, mouseX, mouseY, pticks);
if (!visible)
return;
public void renderBg(PoseStack mstack, Minecraft mc, int mouseX, int mouseY) {
Minecraft.getInstance().getItemRenderer().renderGuiItem(ICON, x + 2, y + 2);
}

2
src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
View file

@ -21,6 +21,8 @@ public enum AllGuiTextures implements ScreenElement {
TERRAINZAPPER_INACTIVE_PARAM("curiosities", 238, 0, 18, 18),
LOGO("logo", 256, 256),
CURSEFORGE_LOGO("platform_icons/curseforge", 256, 256),
MODRINTH_LOGO("platform_icons/modrinth", 256, 256),
SCHEMATIC("schematics", 192, 121),
SCHEMATIC_SLOT("widgets", 54, 0, 16, 16),

45
src/main/java/com/simibubi/create/foundation/gui/CreateMainMenuScreen.java
View file

@ -17,12 +17,14 @@ import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.ChatFormatting;
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.ConfirmLinkScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraft.client.renderer.CubeMap;
import net.minecraft.client.renderer.PanoramaRenderer;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
@ -35,7 +37,11 @@ public class CreateMainMenuScreen extends AbstractSimiScreen {
new ResourceLocation("textures/gui/title/background/panorama_overlay.png");
public static final PanoramaRenderer PANORAMA = new PanoramaRenderer(PANORAMA_RESOURCES);
public static final String PROJECT_LINK = "https://www.curseforge.com/minecraft/mc-mods/create";
private static final Component CURSEFORGE_TOOLTIP = new TextComponent("CurseForge").withStyle(s -> s.withColor(0xFC785C).withBold(true));
private static final Component MODRINTH_TOOLTIP = new TextComponent("Modrinth").withStyle(s -> s.withColor(0x3FD32B).withBold(true));
public static final String CURSEFORGE_LINK = "https://www.curseforge.com/minecraft/mc-mods/create";
public static final String MODRINTH_LINK = "https://modrinth.com/mod/create";
public static final String ISSUE_TRACKER_LINK = "https://github.com/Creators-of-Create/Create/issues";
public static final String SUPPORT_LINK = "https://github.com/Creators-of-Create/Create/wiki/Supporting-the-Project";
@ -146,11 +152,20 @@ public class CreateMainMenuScreen extends AbstractSimiScreen {
gettingStarted.active = !(parent instanceof TitleScreen);
addRenderableWidget(gettingStarted);
addRenderableWidget(new Button(center - 100, yStart + 48 + -16, bShortWidth, bHeight, Lang.translateDirect("menu.project_page"),
$ -> linkTo(PROJECT_LINK)));
addRenderableWidget(new Button(center + 2, yStart + 68, bShortWidth, bHeight, Lang.translateDirect("menu.report_bugs"),
addRenderableWidget(new PlatformIconButton(center - 100, yStart + 48 + -16, bShortWidth / 2, bHeight,
AllGuiTextures.CURSEFORGE_LOGO, 0.085f,
b -> linkTo(CURSEFORGE_LINK),
(b, ps, mx, my) -> renderTooltip(ps, CURSEFORGE_TOOLTIP, mx, my)));
addRenderableWidget(new PlatformIconButton(center - 50, yStart + 48 + -16, bShortWidth / 2, bHeight,
AllGuiTextures.MODRINTH_LOGO, 0.0575f,
b -> linkTo(MODRINTH_LINK),
(b, ps, mx, my) -> renderTooltip(ps, MODRINTH_TOOLTIP, mx, my)));
addRenderableWidget(new Button(center + 2, yStart + 68, bShortWidth, bHeight,
Lang.translateDirect("menu.report_bugs"),
$ -> linkTo(ISSUE_TRACKER_LINK)));
addRenderableWidget(new Button(center - 100, yStart + 68, bShortWidth, bHeight, Lang.translateDirect("menu.support"),
addRenderableWidget(new Button(center - 100, yStart + 68, bShortWidth, bHeight,
Lang.translateDirect("menu.support"),
$ -> linkTo(SUPPORT_LINK)));
}
@ -189,4 +204,24 @@ public class CreateMainMenuScreen extends AbstractSimiScreen {
return true;
}
protected static class PlatformIconButton extends Button {
protected final AllGuiTextures icon;
protected final float scale;
public PlatformIconButton(int pX, int pY, int pWidth, int pHeight, AllGuiTextures icon, float scale, OnPress pOnPress, OnTooltip pOnTooltip) {
super(pX, pY, pWidth, pHeight, TextComponent.EMPTY, pOnPress, pOnTooltip);
this.icon = icon;
this.scale = scale;
}
@Override
protected void renderBg(PoseStack pPoseStack, Minecraft pMinecraft, int pMouseX, int pMouseY) {
pPoseStack.pushPose();
pPoseStack.translate(x + width / 2 - (icon.width * scale) / 2, y + height / 2 - (icon.height * scale) / 2, 0);
pPoseStack.scale(scale, scale, 1);
icon.render(pPoseStack, 0, 0);
pPoseStack.popPose();
}
}
}

1
src/main/resources/assets/create/lang/default/interface.json
View file

@ -26,7 +26,6 @@
"create.menu.configure": "Configure...",
"create.menu.ponder_index": "Ponder Index",
"create.menu.only_ingame": "Available in the Pause Menu",
"create.menu.project_page": "Project Page",
"create.menu.report_bugs": "Report Issues",
"create.menu.support": "Support Us",

BIN
src/main/resources/assets/create/textures/gui/platform_icons/curseforge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
src/main/resources/assets/create/textures/gui/platform_icons/modrinth.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB