xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-08-10 17:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip show contacts

Browse Source
This commit is contained in:
HbmMods 2026-05-07 21:09:50 +02:00
parent c6c5cd91af
commit ea957c95aa
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -5,6 +5,8 @@
## Changed
* RoR graphs can now have their min and max bounds set to a fixed number
* This should make it easier to accurately tell the difference/scale of values when they exist in an expected range (for example, RBMK temperatures)
* RoR controllers now use polling by default, since state change is unable to actually perform a function unless the state changes, preventing repeated commands
## Fixed
* Fixed RoR graph showing the wrong name in the GUI
* Fixed polling option in RoR controllers reading dead signals

8
src/main/java/com/hbm/inventory/gui/GUIScreenRBMKGraph.java
View File

@ -53,9 +53,9 @@ public class GUIScreenRBMKGraph extends GuiScreen {
rtty[i] = new GuiTextField(this.fontRendererObj, guiLeft + 27 + oX, guiTop + 55 + oY + i * 54, 72 - oX * 2, 14);
GUIScreenRBMKKeyPad.setupTextFieldStandard(rtty[i], 10, graph.graphs[i].rtty);
min[i] = new GuiTextField(this.fontRendererObj, guiLeft + 175 + oX, guiTop + 55 + oY + i * 54, 72 - oX * 2, 14);
GUIScreenRBMKKeyPad.setupTextFieldStandard(rtty[i], 15, graph.graphs[i].minBound ? graph.graphs[i].min + "" : "");
GUIScreenRBMKKeyPad.setupTextFieldStandard(min[i], 15, graph.graphs[i].minBound ? graph.graphs[i].min + "" : "");
max[i] = new GuiTextField(this.fontRendererObj, guiLeft + 175 + oX, guiTop + 73 + oY + i * 54, 72 - oX * 2, 14);
GUIScreenRBMKKeyPad.setupTextFieldStandard(rtty[i], 15, graph.graphs[i].maxBound ? graph.graphs[i].max + "" : "");
GUIScreenRBMKKeyPad.setupTextFieldStandard(max[i], 15, graph.graphs[i].maxBound ? graph.graphs[i].max + "" : "");
active[i] = graph.graphs[i].active;
polling[i] = graph.graphs[i].polling;
@ -82,8 +82,8 @@ public class GUIScreenRBMKGraph extends GuiScreen {
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
for(int i = 0; i < 2; i++) {
if(this.active[i]) drawTexturedModalRect(guiLeft + 111, guiTop + i * 54 + 54, 18, 114, 16, 16);
if(this.polling[i]) drawTexturedModalRect(guiLeft + 128, guiTop + i * 54 + 53, 0, 114, 18, 18);
if(this.active[i]) drawTexturedModalRect(guiLeft + 111, guiTop + i * 54 + 54, 18, 150, 16, 16);
if(this.polling[i]) drawTexturedModalRect(guiLeft + 128, guiTop + i * 54 + 53, 0, 150, 18, 18);
}
for(int i = 0; i < 2; i++) {

1
src/main/java/com/hbm/inventory/gui/GUIScreenRBMKTerminal.java
View File

@ -47,6 +47,7 @@ public class GUIScreenRBMKTerminal extends GuiScreen {
this.fontRendererObj.drawString("send <cmd> - Send single signal over selected channel", 2, 22, 0xffffff);
this.fontRendererObj.drawString("start <cmd> - Continuously send signal over selected channel", 2, 32, 0xffffff);
this.fontRendererObj.drawString("stop - Stop continuous sending", 2, 42, 0xffffff);
this.fontRendererObj.drawString("clear - Delete command history", 2, 52, 0xffffff);
}
protected void keyTyped(char c, int b) {

11
src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKTerminal.java
View File

@ -57,12 +57,12 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
if(cmd.startsWith("start ")) {
this.repeatCmd = cmd.substring(6);
push("Repeating signal on channel " + this.channel);
push("Repeating signal on " + this.channel);
this.markChanged();
return;
}
if(cmd.startsWith("stop ")) {
if(cmd.equals("stop")) {
this.repeatCmd = "";
push("Stopping repeat signal");
this.markChanged();
@ -75,7 +75,7 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
return;
}
RTTYSystem.broadcast(worldObj, this.channel, cmd.substring(5));
push("Sent signal on channel " + this.channel);
push("Sent signal on " + this.channel);
return;
}
@ -94,6 +94,11 @@ public class TileEntityRBMKTerminal extends TileEntityLoadedBase implements IGUI
return;
}
if(cmd.equals("clear")) {
for(int i = 0; i < history.length; i++) history[i] = "";
return;
}
push("Unrecognized command!");
}

4
src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchController.java
View File

@ -22,7 +22,7 @@ public class TileEntityRadioTorchController extends TileEntityLoadedBase impleme
public String channel = "";
public String prev;
public boolean polling = false;
public boolean polling = true;
@Override
public void updateEntity() {
@ -49,7 +49,7 @@ public class TileEntityRadioTorchController extends TileEntityLoadedBase impleme
vnt.explode();
return;
}
if(this.polling || !rec.equals(prev)) {
if((this.polling && chan.timeStamp >= worldObj.getTotalWorldTime() - 1) || !rec.equals(prev)) {
try {
if(rec != null && !rec.isEmpty()) ror.runRORFunction(IRORInteractive.PREFIX_FUNCTION + IRORInteractive.getCommand(rec), IRORInteractive.getParams(rec));
} catch(RORFunctionException ex) { }