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.

Sign up for GitHub

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

Add config option for max Environmental Controller radius #1906

Open
wants to merge 3 commits into
base: 1.12
Choose a base branch
from
Open

Add config option for max Environmental Controller radius #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22de917
add config option for max Environmental Controller radius
ajthemacboy Feb 12, 2019
0045a96
I messed up the first one
ajthemacboy Feb 12, 2019
a9488b5
set Environmental Controller slider max to config max
ajthemacboy Feb 13, 2019
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
3 changes: 3 additions & 0 deletions src/main/java/mcjty/rftools/blocks/environmental/EnvironmentalConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public class EnvironmentalConfiguration {
public static final String CATEGORY_ENVIRONMENTAL = "environmental";
public static int ENVIRONMENTAL_MAXENERGY = 500000;
public static int ENVIRONMENTAL_RECEIVEPERTICK = 20000;
public static int ENVIRONMENTAL_MAXRADIUS = 100;
public static int MIN_USAGE = 5;

public static float FEATHERFALLING_RFPERTICK = 0.001f;
Expand Down Expand Up @@ -44,6 +45,8 @@ public static void init(Configuration cfg) {
"Maximum RF storage that the environmental controller can hold").getInt();
ENVIRONMENTAL_RECEIVEPERTICK = cfg.get(CATEGORY_ENVIRONMENTAL, "environmentalRFPerTick", ENVIRONMENTAL_RECEIVEPERTICK,
"RF per tick that the the environmental controller can receive").getInt();
ENVIRONMENTAL_MAXRADIUS = cfg.get(CATEGORY_ENVIRONMENTAL, "environmentalMaxRadius", ENVIRONMENTAL_MAXRADIUS,
"Max radius of environmental controller").getInt();
MIN_USAGE = cfg.get(CATEGORY_ENVIRONMENTAL, "environmentalMinRFUsage", MIN_USAGE,
"The minimum RF/tick usage that an active controller consumes").getInt();

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/mcjty/rftools/blocks/environmental/GuiEnvironmentalController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ private void initializeFields() {
int r = tileEntity.getRadius();
if (r < 5) {
r = 5;
} else if (r > 100) {
r = 100;
} else if (r > EnvironmentalConfiguration.ENVIRONMENTAL_MAXRADIUS) {
r = EnvironmentalConfiguration.ENVIRONMENTAL_MAXRADIUS;
}
((ScrollableLabel)window.findChild("radius")).setRealValue(r);
((ScrollableLabel)window.findChild("radius")).setRealValue(r).setRealMaximum(EnvironmentalConfiguration.ENVIRONMENTAL_MAXRADIUS);

playersList = window.findChild("players");

Expand Down