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

GuideBook stuff #46

Merged
merged 60 commits into from
Aug 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
28ba566
add item Terminal
Yefancy Jul 22, 2021
e4e0e61
amongus
Yefancy Jul 24, 2021
2b797a7
update gui system
Yefancy Jul 25, 2021
d3db429
textbox image widgets
Yefancy Jul 29, 2021
a52383e
frame
Yefancy Jul 29, 2021
7faa2fc
os system
Yefancy Jul 29, 2021
13c5c07
os
Yefancy Jul 29, 2021
b0de1d1
guideeditor
Yefancy Jul 30, 2021
c80ff00
scrollpanelwidgetgroup
Yefancy Jul 31, 2021
7a65c9d
editor...
Yefancy Aug 2, 2021
afcf174
bool, color, common selectors
Yefancy Aug 3, 2021
879671f
CustomDragSizePos
Yefancy Aug 3, 2021
76781ee
details
Yefancy Aug 4, 2021
4eee994
translate + metaitem + simple machine
Yefancy Aug 4, 2021
7a63134
auto missing title
Yefancy Aug 4, 2021
acfdb97
dd
Yefancy Aug 7, 2021
108be60
fix bad slotwidget in gtce
Yefancy Aug 7, 2021
990b7bb
adjust package structure
Yefancy Aug 8, 2021
15d7efb
adjust package structure
Yefancy Aug 8, 2021
899515f
add item Terminal
Yefancy Jul 22, 2021
b188ab7
amongus
Yefancy Jul 24, 2021
ef5a9fd
update gui system
Yefancy Jul 25, 2021
c98ed55
textbox image widgets
Yefancy Jul 29, 2021
ab382bf
frame
Yefancy Jul 29, 2021
e7af22b
os system
Yefancy Jul 29, 2021
148cabb
os
Yefancy Jul 29, 2021
4ae6623
guideeditor
Yefancy Jul 30, 2021
e00e782
scrollpanelwidgetgroup
Yefancy Jul 31, 2021
0f27504
editor...
Yefancy Aug 2, 2021
4a2b811
bool, color, common selectors
Yefancy Aug 3, 2021
8e8d3e8
CustomDragSizePos
Yefancy Aug 3, 2021
a89f293
details
Yefancy Aug 4, 2021
5aa47ca
translate + metaitem + simple machine
Yefancy Aug 4, 2021
cf5ac0d
auto missing title
Yefancy Aug 4, 2021
de87098
dd
Yefancy Aug 7, 2021
a4670e4
fix bad slotwidget in gtce
Yefancy Aug 7, 2021
896a564
adjust package structure
Yefancy Aug 8, 2021
8a49f05
adjust package structure
Yefancy Aug 8, 2021
e3bf33c
fix rebase issues
serenibyss Aug 8, 2021
ee4e6f1
Merge branch 'guide' of https://github.com/Gregicality/GregTech into …
Yefancy Aug 9, 2021
812c6c7
searching
Yefancy Aug 9, 2021
0e306b8
themeAPP
Yefancy Aug 9, 2021
787cca0
ThemeApp WALLPAPER setting
Yefancy Aug 11, 2021
385ae17
fix crash and set default resource wallpaper
Yefancy Aug 11, 2021
6648605
new Menu component -- ClickComponent
Yefancy Aug 11, 2021
03af98f
add loading anima and faild tip for url/filetexture fix theme loading…
Yefancy Aug 12, 2021
73ffdbb
fix SlotWidget
Yefancy Aug 12, 2021
c284ae3
lots of improvements
brachy84 Aug 12, 2021
c887e39
wrench example
brachy84 Aug 12, 2021
8f5c5fb
fix loading on other os
brachy84 Aug 12, 2021
8fb08a0
fix crash in server
Yefancy Aug 12, 2021
0992ac4
json loader, lang file
Yefancy Aug 13, 2021
d40e9be
icons recipe chart demo
Yefancy Aug 15, 2021
e8080d0
serialization + deserialization
Yefancy Aug 16, 2021
f745974
sync mechanism
Yefancy Aug 16, 2021
366a00c
clean up
Yefancy Aug 17, 2021
52bf46f
finish recipechart app
Yefancy Aug 17, 2021
308541f
lang file
Yefancy Aug 18, 2021
c65a89b
lang file
Yefancy Aug 18, 2021
4fb598c
Merge branch 'master' into guide
serenibyss Aug 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions src/main/java/gregtech/GregTechMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import gregtech.api.model.ResourcePackHook;
import gregtech.api.net.NetworkHandler;
import gregtech.api.recipes.RecipeMap;
import gregtech.api.terminal.util.GuideJsonLoader;
import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.IMaterialHandler;
import gregtech.api.unification.material.MaterialRegistry;
Expand All @@ -36,6 +37,8 @@
import gregtech.common.worldgen.WorldGenRubberTree;
import gregtech.integration.theoneprobe.TheOneProbeCompatibility;
import gregtech.loaders.dungeon.DungeonLootLoader;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.SimpleReloadableResourceManager;
import gregtech.loaders.recipe.component.AnnotatedComponentHandlerLoader;
import net.minecraftforge.classloading.FMLForgePlugin;
import net.minecraftforge.fluids.FluidRegistry;
Expand Down Expand Up @@ -63,6 +66,7 @@ public class GregTechMod {
BlockOreFactory.init();
BlockCompressedFactory.init();
BlockFrameFactory.init();
((SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(new GuideJsonLoader());
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gregtech/api/GTValues.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ public class GTValues {
MODID_EIO = "enderio",
MODID_BC = "buildcraftcore",
MODID_COFH = "cofhcore",
MODID_APPENG = "appliedenergistics2";
MODID_APPENG = "appliedenergistics2",
MODID_JEI = "jei";

//because forge is too fucking retarded to cache results or at least do not create fucking
//immutable collections every time you retrieve indexed mod list
Expand Down
1 change: 0 additions & 1 deletion src/main/java/gregtech/api/GregTechAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,4 @@ public static <T extends MetaTileEntity> T registerMetaTileEntity(int id, T samp
META_TILE_ENTITY_REGISTRY.register(id, sampleMetaTileEntity.metaTileEntityId, sampleMetaTileEntity);
return sampleMetaTileEntity;
}

}
16 changes: 16 additions & 0 deletions src/main/java/gregtech/api/gui/GuiTextures.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gregtech.api.gui;

import gregtech.api.gui.resources.AdoptableTextureArea;
import gregtech.api.gui.resources.IGuiTexture;
import gregtech.api.gui.resources.SizedTextureArea;
import gregtech.api.gui.resources.TextureArea;

Expand Down Expand Up @@ -170,4 +171,19 @@ public class GuiTextures {
public static final TextureArea INFO_ICON = TextureArea.fullImage("textures/gui/widget/information.png");
public static final TextureArea MULTIBLOCK_CATEGORY = TextureArea.fullImage("textures/gui/icon/coke_oven.png");

//Terminal
public static final TextureArea ICON_REMOVE = TextureArea.fullImage("textures/gui/terminal/icon/remove_hover.png");
public static final TextureArea ICON_UP = TextureArea.fullImage("textures/gui/terminal/icon/up_hover.png");
public static final TextureArea ICON_DOWN = TextureArea.fullImage("textures/gui/terminal/icon/down_hover.png");
public static final TextureArea ICON_RIGHT = TextureArea.fullImage("textures/gui/terminal/icon/right_hover.png");
public static final TextureArea ICON_LEFT = TextureArea.fullImage("textures/gui/terminal/icon/left_hover.png");
public static final TextureArea ICON_ADD = TextureArea.fullImage("textures/gui/terminal/icon/add_hover.png");

public final static TextureArea ICON_NEW_PAGE = TextureArea.fullImage("textures/gui/terminal/icon/system/memory_card_hover.png");
public final static TextureArea ICON_LOAD = TextureArea.fullImage("textures/gui/terminal/icon/folder_hover.png");
public final static TextureArea ICON_SAVE = TextureArea.fullImage("textures/gui/terminal/icon/system/save_hover.png");
public final static TextureArea ICON_LOCATION = TextureArea.fullImage("textures/gui/terminal/icon/guide_hover.png");
public final static TextureArea ICON_VISIBLE = TextureArea.fullImage("textures/gui/terminal/icon/appearance_hover.png");
public final static TextureArea ICON_CALCULATOR = TextureArea.fullImage("textures/gui/terminal/icon/other/calculator_hover.png");

}
1 change: 1 addition & 0 deletions src/main/java/gregtech/api/gui/ModularUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public List<Widget> getFlatVisibleWidgetCollection() {
List<Widget> widgetList = new ArrayList<>(guiWidgets.size());

for (Widget widget : guiWidgets.values()) {
if (!widget.isVisible()) continue;
widgetList.add(widget);

if (widget instanceof AbstractWidgetGroup)
Expand Down
Loading