Skip to content

Commit

Permalink
Actually updated the mappings this time
Browse files Browse the repository at this point in the history
  • Loading branch information
brentmaas committed Dec 10, 2021
1 parent 302d5b0 commit 5d23b72
Show file tree
Hide file tree
Showing 17 changed files with 154 additions and 154 deletions.
12 changes: 6 additions & 6 deletions src/main/java/brentmaas/buildguide/InputHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ public static void register() {

@SubscribeEvent
public void onKeyInput(KeyInputEvent event) {
if(openBuildGuide.isPressed()) {
Minecraft.getInstance().displayGuiScreen(new BuildGuideScreen());
if(openBuildGuide.isDown()) {
Minecraft.getInstance().setScreen(new BuildGuideScreen());
}

if(openShapeList.isPressed() && StateManager.getState().propertyAdvancedMode.value) {
Minecraft.getInstance().displayGuiScreen(new ShapelistScreen());
if(openShapeList.isDown() && StateManager.getState().propertyAdvancedMode.value) {
Minecraft.getInstance().setScreen(new ShapelistScreen());
}

if(openVisualisation.isPressed()) {
Minecraft.getInstance().displayGuiScreen(new VisualisationScreen());
if(openVisualisation.isDown()) {
Minecraft.getInstance().setScreen(new VisualisationScreen());
}
}
}
14 changes: 7 additions & 7 deletions src/main/java/brentmaas/buildguide/RenderHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static void register() {

@SubscribeEvent
public void onRenderBlock(RenderWorldLastEvent event) {
Minecraft.getInstance().getProfiler().startSection("buildguide");
Minecraft.getInstance().getProfiler().push("buildguide");

if(StateManager.getState().propertyEnable.value && StateManager.getState().isShapeAvailable() && StateManager.getState().getCurrentShape().basePos != null) {
MatrixStack stack = event.getMatrixStack();
Expand All @@ -33,17 +33,17 @@ public void onRenderBlock(RenderWorldLastEvent event) {
}
}

Minecraft.getInstance().getProfiler().endSection();
Minecraft.getInstance().getProfiler().pop();
}

private void renderShape(MatrixStack stack, Shape s) {
if(s.visible) {
stack.push();
Vector3d projectedView = Minecraft.getInstance().gameRenderer.getActiveRenderInfo().getProjectedView();
stack.pushPose();
Vector3d projectedView = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition();
stack.translate(-projectedView.x + s.basePos.x, -projectedView.y + s.basePos.y, -projectedView.z + s.basePos.z);

RenderSystem.pushMatrix();
RenderSystem.multMatrix(stack.getLast().getMatrix());
RenderSystem.multMatrix(stack.last().pose());

boolean toggleTexture = GL11.glIsEnabled(GL11.GL_TEXTURE_2D);

Expand All @@ -62,7 +62,7 @@ private void renderShape(MatrixStack stack, Shape s) {
RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
if(toggleBlend) RenderSystem.enableBlend();

s.render(stack.getLast().getMatrix());
s.render(stack.last().pose());

if(toggleBlend) RenderSystem.disableBlend();
if(toggleDepthTest && hasDepthTest) RenderSystem.enableDepthTest();
Expand All @@ -72,7 +72,7 @@ private void renderShape(MatrixStack stack, Shape s) {

RenderSystem.popMatrix();

stack.pop();
stack.popPose();
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/brentmaas/buildguide/State.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class State {
public int iAdvanced = 0;
public PropertyBoolean propertyEnable = new PropertyBoolean(-4, false, new TranslationTextComponent("screen.buildguide.enable"), null);
public PropertyBoolean propertyDepthTest = new PropertyBoolean(2, true, new TranslationTextComponent("screen.buildguide.depthtest"), null);
public PropertyBoolean propertyAdvancedMode = new PropertyBoolean(-2, false, new TranslationTextComponent("screen.buildguide.advancedmode"), () -> Minecraft.getInstance().displayGuiScreen(new BuildGuideScreen()));
public PropertyBoolean propertyAdvancedMode = new PropertyBoolean(-2, false, new TranslationTextComponent("screen.buildguide.advancedmode"), () -> Minecraft.getInstance().setScreen(new BuildGuideScreen()));

public State() {
ArrayList<String> classIdentifiers = ShapeRegistry.getClassIdentifiers();
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/brentmaas/buildguide/StateManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ public static void init() {

private static String getKey() {
String host;
if(Minecraft.getInstance().getIntegratedServer() != null) {
host = Minecraft.getInstance().getIntegratedServer().getServerConfiguration().getWorldName();
}else if(Minecraft.getInstance().getCurrentServerData() != null) {
host = Minecraft.getInstance().getCurrentServerData().serverIP;
if(Minecraft.getInstance().getSingleplayerServer() != null) {
host = Minecraft.getInstance().getSingleplayerServer().getWorldData().getLevelName();
}else if(Minecraft.getInstance().getCurrentServer() != null) {
host = Minecraft.getInstance().getCurrentServer().ip;
}else {
host = "unknown";
}

return host + "@" + Minecraft.getInstance().world.getDimensionKey().getLocation();
return host + "@" + Minecraft.getInstance().level.dimension().location();
}

public static State getState() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/brentmaas/buildguide/property/Property.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia

protected void drawString(MatrixStack matrixStack, String text, float x, float y, int colour, FontRenderer font) {
if(visible) {
font.drawStringWithShadow(matrixStack, text, x, y, colour);
font.drawShadow(matrixStack, text, x, y, colour);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class PropertyBoolean extends Property<Boolean>{
public PropertyBoolean(int slot, Boolean value, TextComponent name, Runnable onUpdate) {
super(slot, value, name, onUpdate);
button = new CheckboxRunnableButton(140, y, 20, 20, new StringTextComponent(""), value, false, button -> {
this.value = button.isChecked();
this.value = button.selected();
if(onUpdate != null) onUpdate.run();
});
buttonList.add(button);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public PropertyEnum(int slot, T value, TextComponent name, Runnable onUpdate, St

public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks, FontRenderer font) {
super.render(matrixStack, mouseX, mouseY, partialTicks, font);
drawString(matrixStack, names[value.ordinal()], 110 + (80 - font.getStringWidth(names[value.ordinal()])) / 2, y + 5, 0xFFFFFF, font);
drawString(matrixStack, names[value.ordinal()], 110 + (80 - font.width(names[value.ordinal()])) / 2, y + 5, 0xFFFFFF, font);
}

public void addTextFields(FontRenderer fr) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/brentmaas/buildguide/property/PropertyInt.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ public PropertyInt(int slot, int value, TextComponent name, Runnable onUpdate) {
super(slot, value, name, onUpdate);
buttonList.add(new Button(90, y, 20, 20, new StringTextComponent("-"), button -> {
--this.value;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(190, y, 20, 20, new StringTextComponent("+"), button -> {
++this.value;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(160, y, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> {
try {
int newval = Integer.parseInt(valueWidget.getText());
int newval = Integer.parseInt(valueWidget.getValue());
this.value = newval;
valueWidget.setTextColor(0xFFFFFF);
}catch(NumberFormatException e) {
Expand All @@ -37,13 +37,13 @@ public PropertyInt(int slot, int value, TextComponent name, Runnable onUpdate) {

public void setValue(Integer value) {
super.setValue(value);
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
}

public void addTextFields(FontRenderer fr) {
valueWidget = new TextFieldWidget(fr, 110, y, 50, 20, new StringTextComponent(""));
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
textFieldList.add(valueWidget);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ public PropertyMinimumInt(int slot, int value, TextComponent name, Runnable onUp
this.minInt = minInt;
buttonList.add(new Button(90, y, 20, 20, new StringTextComponent("-"), button -> {
if(this.value > this.minInt) --this.value;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(190, y, 20, 20, new StringTextComponent("+"), button -> {
++this.value;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(160, y, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> {
try {
int newval = Integer.parseInt(valueWidget.getText());
int newval = Integer.parseInt(valueWidget.getValue());
this.value = newval;
if(this.value < minInt) {
this.value = minInt;
}
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}catch(NumberFormatException e) {
Expand All @@ -44,13 +44,13 @@ public PropertyMinimumInt(int slot, int value, TextComponent name, Runnable onUp

public void setValue(Integer value) {
super.setValue(value);
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
}

public void addTextFields(FontRenderer fr) {
valueWidget = new TextFieldWidget(fr, 110, y, 50, 20, new StringTextComponent(""));
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
textFieldList.add(valueWidget);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ public PropertyNonzeroInt(int slot, int value, TextComponent name, Runnable onUp
buttonList.add(new Button(90, y, 20, 20, new StringTextComponent("-"), button -> {
--this.value;
if(this.value == 0) this.value = -1;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(190, y, 20, 20, new StringTextComponent("+"), button -> {
++this.value;
if(this.value == 0) this.value = 1;
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}));
buttonList.add(new Button(160, y, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> {
try {
int newval = Integer.parseInt(valueWidget.getText());
int newval = Integer.parseInt(valueWidget.getValue());
this.value = newval;
if(this.value == 0) {
this.value = 1;
}
valueWidget.setText("" + this.value);
valueWidget.setValue("" + this.value);
valueWidget.setTextColor(0xFFFFFF);
if(onUpdate != null) onUpdate.run();
}catch(NumberFormatException e) {
Expand All @@ -44,13 +44,13 @@ public PropertyNonzeroInt(int slot, int value, TextComponent name, Runnable onUp

public void setValue(Integer value) {
super.setValue(value);
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
}

public void addTextFields(FontRenderer fr) {
valueWidget = new TextFieldWidget(fr, 110, y, 50, 20, new StringTextComponent(""));
valueWidget.setText("" + value);
valueWidget.setValue("" + value);
valueWidget.setTextColor(0xFFFFFF);
textFieldList.add(valueWidget);
}
Expand Down
Loading

0 comments on commit 5d23b72

Please sign in to comment.