Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
79be44e
Added loki config switching
ReignOfFROZE Mar 2, 2025
f601f77
Remove CT dep
ReignOfFROZE Mar 2, 2025
fc21641
Made ModularUI an optional dependency
ReignOfFROZE Mar 2, 2025
8c6fb51
Update to MUI2
ReignOfFROZE Mar 2, 2025
ff38e8e
Remove unused files
ReignOfFROZE Mar 2, 2025
da5cbb6
not sure why the pencil was big
ReignOfFROZE Mar 2, 2025
3620cf9
Added new icons and adjusted GUI scale
ReignOfFROZE Mar 3, 2025
2b59c48
Adjust header text scale
ReignOfFROZE Mar 3, 2025
3bcfb45
Remove useless annotation
ReignOfFROZE Mar 3, 2025
29fe5f0
Organize imports
ReignOfFROZE Mar 3, 2025
055aa62
Added a little bit of polish
ReignOfFROZE Mar 3, 2025
dcfa71c
Remove runtime dependency on MUI2
ReignOfFROZE Mar 5, 2025
a3d8aa9
Merge upstream/master to master
ReignOfFROZE Mar 5, 2025
82771d4
Don't use wildcard imports
glowredman Mar 6, 2025
ba99165
Added packet for renaming and check if the ring is null before trying…
ReignOfFROZE Mar 22, 2025
3aaf74a
Cleanup pass
YannickMG Apr 22, 2025
a6445da
Fix deleting schematics leaving holes
YannickMG Apr 23, 2025
46c88f4
Replace Baubles with Baubles Expanded (#81)
Caedis May 14, 2025
070e6a7
update
Dream-Master May 16, 2025
7ad708e
Add configurable F3 Debug (#78)
brandyyn May 26, 2025
83512d4
update
serenibyss May 26, 2025
c8fe3c8
update
Dream-Master Jun 8, 2025
7fd1bcb
update
Dream-Master Jun 8, 2025
5325153
Add missing equals sign (#83)
Nikolay-Sitnikov Jun 6, 2025
4bbb0e9
Fix the rest of the lang file mistakes in Botania (#84)
Nikolay-Sitnikov Jun 6, 2025
04345bb
Rebase & comments pt 1
ReignOfFROZE Jun 19, 2025
294abf4
Merge branch 'master' into master
Dream-Master Jun 30, 2025
0fda050
Merge branch 'master' into master
Dream-Master Jul 17, 2025
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
1 change: 1 addition & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false}
api('com.github.GTNewHorizons:GTNHLib:0.6.1:dev')
implementation("com.github.GTNewHorizons:ModularUI:1.2.18:dev")

compileOnly('curse.maven:cofh-lib-220333:2388748')
compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
Expand Down
30 changes: 25 additions & 5 deletions src/main/java/vazkii/botania/client/core/handler/KeyHandler.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package vazkii.botania.client.core.handler;

import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.settings.KeyBinding;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketLokiClear;
import vazkii.botania.common.network.PacketLokiMirror;
import vazkii.botania.common.network.PacketLokiToggle;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import vazkii.botania.common.item.relic.ItemLokiRing;
import vazkii.botania.common.network.*;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
Expand All @@ -17,12 +20,16 @@ public class KeyHandler {
private static final KeyBinding keyToggleRingOfLoki= new KeyBinding("botaniamisc.toggleLoki", 0, "botaniamisc.keyCategory");
private static final KeyBinding keyRingOfLokiClear= new KeyBinding("botaniamisc.ringOfLokiClear", 0, "botaniamisc.keyCategory");
private static final KeyBinding keyRingOfLokiMirror= new KeyBinding("botaniamisc.ringOfLokiMirror", 0, "botaniamisc.keyCategory");
private static final KeyBinding keyRingOfLokiSaveSchematic= new KeyBinding("botaniamisc.ringOfLokiSaveSchematic", 0, "botaniamisc.keyCategory");
private static final KeyBinding keyRingOfLokiOpenUI= new KeyBinding("botaniamisc.ringOfLokiOpenUI", 0, "botaniamisc.keyCategory");

public KeyHandler() {
FMLCommonHandler.instance().bus().register(this);
ClientRegistry.registerKeyBinding(keyToggleRingOfLoki);
ClientRegistry.registerKeyBinding(keyRingOfLokiClear);
ClientRegistry.registerKeyBinding(keyRingOfLokiMirror);
ClientRegistry.registerKeyBinding(keyRingOfLokiSaveSchematic);
ClientRegistry.registerKeyBinding(keyRingOfLokiOpenUI);

}
@SideOnly(Side.CLIENT)
Expand All @@ -41,16 +48,29 @@ private void checkAndPerformKeyActions(){
if(keyRingOfLokiMirror.isPressed()){
toggleRingLokiMirroring();
}
if(keyRingOfLokiSaveSchematic.isPressed()){
ringOfLokiSaveSchematic();
}
if(keyRingOfLokiOpenUI.isPressed()) {
ringOfLokiOpenUI();
}
}


private static void toggleRingLoki() {
PacketHandler.INSTANCE.sendToServer(new PacketLokiToggle());
}

private static void ringOfLokiClear() {
PacketHandler.INSTANCE.sendToServer(new PacketLokiClear());
}
private static void toggleRingLokiMirroring() {
PacketHandler.INSTANCE.sendToServer(new PacketLokiMirror());
}
private static void ringOfLokiSaveSchematic() {
PacketHandler.INSTANCE.sendToServer(new PacketLokiSaveSchematic());
}
private static void ringOfLokiOpenUI() {
ItemStack ring = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer);
ItemLokiRing.openUI(Minecraft.getMinecraft().thePlayer, ring);
}
}
144 changes: 144 additions & 0 deletions src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
package vazkii.botania.client.gui.loki;

import com.gtnewhorizons.modularui.api.ModularUITextures;
import com.gtnewhorizons.modularui.api.UIInfos;
import com.gtnewhorizons.modularui.api.drawable.AdaptableUITexture;
import com.gtnewhorizons.modularui.api.drawable.IDrawable;
import com.gtnewhorizons.modularui.api.drawable.Text;
import com.gtnewhorizons.modularui.api.math.Alignment;
import com.gtnewhorizons.modularui.api.math.Pos2d;
import com.gtnewhorizons.modularui.api.math.Size;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.api.widget.IWidgetParent;
import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
import com.gtnewhorizons.modularui.common.widget.MultiChildWidget;
import com.gtnewhorizons.modularui.common.widget.Scrollable;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import vazkii.botania.common.item.relic.ItemLokiRing;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketLokiChangeSchematic;
import vazkii.botania.common.network.PacketLokiDeleteSchematic;

import java.util.concurrent.atomic.AtomicInteger;

public class GuiLokiSchematics {

private static final AdaptableUITexture BACKGROUND = AdaptableUITexture
.of("botania:textures/gui/croppedPaper", 330, 252, 12);
private static Object selectedSchematic;
private static final AdaptableUITexture DELETE = AdaptableUITexture
.of("botania:textures/gui/lokiDelete", 500, 500, 0);
private static final AdaptableUITexture RENAME = AdaptableUITexture
.of("botania:textures/gui/lokiRename", 500, 500, 0);
private static String newSchematicName = "";

private static final int WINDOW_WIDTH = 350, WINDOW_HEIGHT = 225, SCROLL_AREA_WIDTH = 350, SCROLL_AREA_HEIGHT = 200, SAVED_SCHEMATICS_HEADER_HEIGHT = 25, X_PADDING = 5, Y_PADDING = 5;

public static ModularWindow getWindow(UIBuildContext buildContext, ItemStack lokiRing) {
if(lokiRing.getTagCompound().tagMap.containsKey(ItemLokiRing.TAG_CURRENT_SCHEMATIC)) {
// Substring to remove the leading and ending double quotes
selectedSchematic = lokiRing.stackTagCompound.getString(ItemLokiRing.TAG_CURRENT_SCHEMATIC).substring(1);
selectedSchematic = selectedSchematic.toString().substring(0, selectedSchematic.toString().length() - 1);
}
ItemLokiRing ring = (ItemLokiRing) lokiRing.getItem();
ModularWindow.Builder builder = ModularWindow.builder(WINDOW_WIDTH, WINDOW_HEIGHT);
buildContext.setShowNEI(false);
builder.setBackground(ModularUITextures.VANILLA_BACKGROUND);
Scrollable scrollArea =
new Scrollable()
.setVerticalScroll();
if(lokiRing.getTagCompound().tagMap.containsKey(ItemLokiRing.TAG_SAVED_SCHEMATICS) && !lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).tagMap.keySet().isEmpty()) {
final AtomicInteger offset = new AtomicInteger();
final AtomicInteger disabled = new AtomicInteger();
for(Object schematicName : lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).tagMap.keySet()) {
scrollArea = scrollArea.widget(new ButtonWidget()
.setOnClick((clickData, widget) -> {
selectedSchematic = schematicName;
PacketHandler.INSTANCE.sendToServer(new PacketLokiChangeSchematic(schematicName.toString()));
})
.setBackground(() -> new IDrawable[]{new Text(schematicName.toString()).format(selectedSchematic.toString().equals(schematicName.toString()) ? EnumChatFormatting.DARK_GREEN : EnumChatFormatting.BLACK)})
.setSize(SCROLL_AREA_WIDTH - 60, SCROLL_AREA_HEIGHT / 10)
.setEnabled((widget) -> {
if(lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).hasKey(schematicName.toString())) {
return true;
}
disabled.getAndIncrement();
return false;
})
.setPosProvider((Size screenSize, ModularWindow window, IWidgetParent parent) -> new Pos2d(0, ring.schematicNames.indexOf(schematicName) * (SCROLL_AREA_HEIGHT / 10 + 1))));
scrollArea = scrollArea.widget(new ButtonWidget()
.setOnClick((clickData, widget) -> {
UIInfos.openClientUI(buildContext.getPlayer(), (context) -> GuiLokiSchematics.getRenameWindow(context, lokiRing, schematicName));
})
.setBackground(RENAME)
.setPosProvider((Size screenSize, ModularWindow window, IWidgetParent parent) -> new Pos2d(SCROLL_AREA_WIDTH - 55, ring.schematicNames.indexOf(schematicName) * (SCROLL_AREA_HEIGHT / 10 + 1)))
.setEnabled((widget) -> lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).hasKey(schematicName.toString()))
.setSize(20, 20));
scrollArea = scrollArea.widget(new ButtonWidget()
.setOnClick((clickData, widget) -> {
PacketHandler.INSTANCE.sendToServer(new PacketLokiDeleteSchematic(schematicName.toString()));
buildContext.setValidator(() -> false);
})
.setBackground(DELETE)
.setPosProvider((Size screenSize, ModularWindow window, IWidgetParent parent) -> new Pos2d(SCROLL_AREA_WIDTH - 30, ring.schematicNames.indexOf(schematicName) * (SCROLL_AREA_HEIGHT / 10 + 1)))
.setEnabled((widget) -> lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).hasKey(schematicName.toString()))
.setSize(20, 20));
offset.addAndGet((SCROLL_AREA_HEIGHT / 10) + 1);
}
}
scrollArea = scrollArea.widget(new TextWidget("No saved schematics!")
.setEnabled((widget) -> !lokiRing.getTagCompound().hasKey(ItemLokiRing.TAG_SAVED_SCHEMATICS) || lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).tagMap.keySet().isEmpty())
.setSize(SCROLL_AREA_WIDTH, SCROLL_AREA_HEIGHT)
.setPos(0, 0));
return builder
.widget(
new MultiChildWidget()
.addChild(
new TextWidget()
.setScale(0.5F)
.setTextSupplier(() -> new Text(selectedSchematic == null ? StatCollector.translateToLocal("botaniamisc.select_schematic") : StatCollector.translateToLocal("botaniamisc.selected_schematic") + " " + selectedSchematic)
.format(selectedSchematic == null ? EnumChatFormatting.RED : EnumChatFormatting.BLACK)
.alignment(Alignment.Center))
.setSize(SCROLL_AREA_WIDTH, SAVED_SCHEMATICS_HEADER_HEIGHT))
.addChild(
scrollArea
.setSize(SCROLL_AREA_WIDTH, SCROLL_AREA_HEIGHT - SAVED_SCHEMATICS_HEADER_HEIGHT - Y_PADDING * 2)
.setPos(0, SAVED_SCHEMATICS_HEADER_HEIGHT))
.setPos(WINDOW_WIDTH - SCROLL_AREA_WIDTH - X_PADDING, 0))
.setBackground(BACKGROUND)
.build();
}

public static ModularWindow getRenameWindow(UIBuildContext buildContext, ItemStack lokiRing, Object schematicName) {
ModularWindow.Builder builder = ModularWindow.builder(200, 100);

buildContext.addCloseListener(() -> {
if(lokiRing.getTagCompound().getString(ItemLokiRing.TAG_CURRENT_SCHEMATIC).equals(schematicName)) {
lokiRing.getTagCompound().setString(ItemLokiRing.TAG_CURRENT_SCHEMATIC, newSchematicName);
}
NBTBase nbt = lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).getTag(schematicName.toString());
lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).removeTag(schematicName.toString());
lokiRing.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).setTag(newSchematicName, nbt);
});

return builder
.widget(new TextWidget()
.setTextSupplier(() -> new Text("Schematic Name:").format(EnumChatFormatting.BLACK))
.setPos(10, 10)
.setSize(180, 20))
.widget(new TextFieldWidget()
.setGetter(() -> newSchematicName)
.setSetter((newValue) -> newSchematicName = newValue)
.setSize(150, 20)
.setPos(25, 40))
.setBackground(BACKGROUND)
.build();
}
}
Loading
Loading