diff --git a/src/main/java/brentmaas/buildguide/InputHandler.java b/src/main/java/brentmaas/buildguide/InputHandler.java index 4a198ae..b87cd15 100644 --- a/src/main/java/brentmaas/buildguide/InputHandler.java +++ b/src/main/java/brentmaas/buildguide/InputHandler.java @@ -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()); } } } diff --git a/src/main/java/brentmaas/buildguide/RenderHandler.java b/src/main/java/brentmaas/buildguide/RenderHandler.java index e60b902..d8a0e16 100644 --- a/src/main/java/brentmaas/buildguide/RenderHandler.java +++ b/src/main/java/brentmaas/buildguide/RenderHandler.java @@ -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(); @@ -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); @@ -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(); @@ -72,7 +72,7 @@ private void renderShape(MatrixStack stack, Shape s) { RenderSystem.popMatrix(); - stack.pop(); + stack.popPose(); } } } diff --git a/src/main/java/brentmaas/buildguide/State.java b/src/main/java/brentmaas/buildguide/State.java index 6e4a426..898870c 100644 --- a/src/main/java/brentmaas/buildguide/State.java +++ b/src/main/java/brentmaas/buildguide/State.java @@ -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 classIdentifiers = ShapeRegistry.getClassIdentifiers(); diff --git a/src/main/java/brentmaas/buildguide/StateManager.java b/src/main/java/brentmaas/buildguide/StateManager.java index 7071510..b19c24c 100644 --- a/src/main/java/brentmaas/buildguide/StateManager.java +++ b/src/main/java/brentmaas/buildguide/StateManager.java @@ -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() { diff --git a/src/main/java/brentmaas/buildguide/property/Property.java b/src/main/java/brentmaas/buildguide/property/Property.java index e5dc1b3..6584a0a 100644 --- a/src/main/java/brentmaas/buildguide/property/Property.java +++ b/src/main/java/brentmaas/buildguide/property/Property.java @@ -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); } } } diff --git a/src/main/java/brentmaas/buildguide/property/PropertyBoolean.java b/src/main/java/brentmaas/buildguide/property/PropertyBoolean.java index 8b50d6f..73a7180 100644 --- a/src/main/java/brentmaas/buildguide/property/PropertyBoolean.java +++ b/src/main/java/brentmaas/buildguide/property/PropertyBoolean.java @@ -11,7 +11,7 @@ public class PropertyBoolean extends Property{ 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); diff --git a/src/main/java/brentmaas/buildguide/property/PropertyEnum.java b/src/main/java/brentmaas/buildguide/property/PropertyEnum.java index e2405de..c89d1d4 100644 --- a/src/main/java/brentmaas/buildguide/property/PropertyEnum.java +++ b/src/main/java/brentmaas/buildguide/property/PropertyEnum.java @@ -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) { diff --git a/src/main/java/brentmaas/buildguide/property/PropertyInt.java b/src/main/java/brentmaas/buildguide/property/PropertyInt.java index 190dc2d..72322c8 100644 --- a/src/main/java/brentmaas/buildguide/property/PropertyInt.java +++ b/src/main/java/brentmaas/buildguide/property/PropertyInt.java @@ -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) { @@ -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); } diff --git a/src/main/java/brentmaas/buildguide/property/PropertyMinimumInt.java b/src/main/java/brentmaas/buildguide/property/PropertyMinimumInt.java index 06a5e4a..de0ef41 100644 --- a/src/main/java/brentmaas/buildguide/property/PropertyMinimumInt.java +++ b/src/main/java/brentmaas/buildguide/property/PropertyMinimumInt.java @@ -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) { @@ -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); } diff --git a/src/main/java/brentmaas/buildguide/property/PropertyNonzeroInt.java b/src/main/java/brentmaas/buildguide/property/PropertyNonzeroInt.java index 35c37dc..2992be8 100644 --- a/src/main/java/brentmaas/buildguide/property/PropertyNonzeroInt.java +++ b/src/main/java/brentmaas/buildguide/property/PropertyNonzeroInt.java @@ -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) { @@ -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); } diff --git a/src/main/java/brentmaas/buildguide/screen/BuildGuideScreen.java b/src/main/java/brentmaas/buildguide/screen/BuildGuideScreen.java index 5bf1528..6e64885 100644 --- a/src/main/java/brentmaas/buildguide/screen/BuildGuideScreen.java +++ b/src/main/java/brentmaas/buildguide/screen/BuildGuideScreen.java @@ -22,9 +22,9 @@ public class BuildGuideScreen extends PropertyScreen{ //It's better off as custom buttons instead of PropertyEnum private Button buttonShapePrevious = new Button(60, 25, 20, 20, new StringTextComponent("<-"), button -> updateShape(-1)); private Button buttonShapeNext = new Button(140, 25, 20, 20, new StringTextComponent("->"), button -> updateShape(1)); - private Button buttonShapelist = new Button(140, 25, 20, 20, new StringTextComponent("..."), button -> Minecraft.getInstance().displayGuiScreen(new ShapelistScreen())); + private Button buttonShapelist = new Button(140, 25, 20, 20, new StringTextComponent("..."), button -> Minecraft.getInstance().setScreen(new ShapelistScreen())); private Button buttonBasepos = new Button(185, 25, 120, 20, new TranslationTextComponent("screen.buildguide.setbasepos"), button -> StateManager.getState().resetBasepos()); - private Button buttonVisualisation = new Button(0, 65, 160, 20, new TranslationTextComponent("screen.buildguide.visualisation"), button -> Minecraft.getInstance().displayGuiScreen(new VisualisationScreen())); + private Button buttonVisualisation = new Button(0, 65, 160, 20, new TranslationTextComponent("screen.buildguide.visualisation"), button -> Minecraft.getInstance().setScreen(new VisualisationScreen())); //It's better off as custom buttons instead of PropertyInt private Button buttonBaseposXDecrease = new Button(185, 45, 20, 20, new StringTextComponent("-"), button -> shiftBasePos(-1, 0, 0)); private Button buttonBaseposXIncrease = new Button(285, 45, 20, 20, new StringTextComponent("+"), button -> shiftBasePos(1, 0, 0)); @@ -37,7 +37,7 @@ public class BuildGuideScreen extends PropertyScreen{ private TextFieldWidget textFieldZ; private Button buttonSetX = new Button(255, 45, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldX.getText()); + int newval = Integer.parseInt(textFieldX.getValue()); StateManager.getState().setBaseposX(newval); textFieldX.setTextColor(0xFFFFFF); }catch(NumberFormatException e) { @@ -46,7 +46,7 @@ public class BuildGuideScreen extends PropertyScreen{ }); private Button buttonSetY = new Button(255, 65, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldY.getText()); + int newval = Integer.parseInt(textFieldY.getValue()); StateManager.getState().setBaseposY(newval); textFieldY.setTextColor(0xFFFFFF); }catch(NumberFormatException e) { @@ -55,7 +55,7 @@ public class BuildGuideScreen extends PropertyScreen{ }); private Button buttonSetZ = new Button(255, 85, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldZ.getText()); + int newval = Integer.parseInt(textFieldZ.getValue()); StateManager.getState().setBaseposZ(newval); textFieldZ.setTextColor(0xFFFFFF); }catch(NumberFormatException e) { @@ -83,7 +83,7 @@ protected void init() { //Advanced mode shapes should be empty } - buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().displayGuiScreen(null)); + buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().setScreen(null)); if(!StateManager.getState().isShapeAvailable()) { buttonBasepos.active = false; @@ -119,15 +119,15 @@ protected void init() { addButton(buttonSetZ); textFieldX = new TextFieldWidget(font, 205, 45, 50, 20, new StringTextComponent("")); - textFieldX.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.x : "-"); + textFieldX.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.x : "-"); textFieldX.setTextColor(0xFFFFFF); children.add(textFieldX); textFieldY = new TextFieldWidget(font, 205, 65, 50, 20, new StringTextComponent("")); - textFieldY.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.y : "-"); + textFieldY.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.y : "-"); textFieldY.setTextColor(0xFFFFFF); children.add(textFieldY); textFieldZ = new TextFieldWidget(font, 205, 85, 50, 20, new StringTextComponent("")); - textFieldZ.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.z : "-"); + textFieldZ.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.z : "-"); textFieldZ.setTextColor(0xFFFFFF); children.add(textFieldZ); @@ -156,25 +156,25 @@ protected void init() { @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { super.render(matrixStack, mouseX, mouseY, partialTicks); - font.drawStringWithShadow(matrixStack, title.getString(), (width - font.getStringWidth(title.getString())) / 2, 5, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleGlobalProperties, (160 - font.getStringWidth(titleGlobalProperties)) / 2, 15, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleShapeProperties, (160 - font.getStringWidth(titleShapeProperties)) / 2, 115, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleBasepos, 185 + (120 - font.getStringWidth(titleBasepos)) / 2, 15, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleNumberOfBlocks, 305 + (100 - font.getStringWidth(titleNumberOfBlocks)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, title.getString(), (width - font.width(title.getString())) / 2, 5, 0xFFFFFF); + font.drawShadow(matrixStack, titleGlobalProperties, (160 - font.width(titleGlobalProperties)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, titleShapeProperties, (160 - font.width(titleShapeProperties)) / 2, 115, 0xFFFFFF); + font.drawShadow(matrixStack, titleBasepos, 185 + (120 - font.width(titleBasepos)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, titleNumberOfBlocks, 305 + (100 - font.width(titleNumberOfBlocks)) / 2, 15, 0xFFFFFF); int n = StateManager.getState().isShapeAvailable() ? StateManager.getState().getCurrentShape().getNumberOfBlocks() : 0; String numberOfBlocks = "" + n; String numberOfStacks = "(" + (n / 64) + " x 64 + " + (n % 64) + ")"; - font.drawStringWithShadow(matrixStack, numberOfBlocks, 305 + (100 - font.getStringWidth(numberOfBlocks)) / 2, 30, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, numberOfStacks, 305 + (100 - font.getStringWidth(numberOfStacks)) / 2, 45, 0xFFFFFF); + font.drawShadow(matrixStack, numberOfBlocks, 305 + (100 - font.width(numberOfBlocks)) / 2, 30, 0xFFFFFF); + font.drawShadow(matrixStack, numberOfStacks, 305 + (100 - font.width(numberOfStacks)) / 2, 45, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, textShape, 5, 30, 0xFFFFFF); + font.drawShadow(matrixStack, textShape, 5, 30, 0xFFFFFF); String shapeName = StateManager.getState().isShapeAvailable() ? StateManager.getState().getCurrentShape().getTranslatedName() : new TranslationTextComponent("shape.buildguide.none").getString(); - font.drawStringWithShadow(matrixStack, shapeName, 80 + (60 - font.getStringWidth(shapeName)) / 2, 30, 0xFFFFFF); + font.drawShadow(matrixStack, shapeName, 80 + (60 - font.width(shapeName)) / 2, 30, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, "X", 170, 50, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, "Y", 170, 70, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, "Z", 170, 90, 0xFFFFFF); + font.drawShadow(matrixStack, "X", 170, 50, 0xFFFFFF); + font.drawShadow(matrixStack, "Y", 170, 70, 0xFFFFFF); + font.drawShadow(matrixStack, "Z", 170, 90, 0xFFFFFF); textFieldX.render(matrixStack, mouseX, mouseY, partialTicks); textFieldY.render(matrixStack, mouseX, mouseY, partialTicks); @@ -191,9 +191,9 @@ private void updateShape(int di) { private void shiftBasePos(int dx, int dy, int dz) { StateManager.getState().shiftBasepos(dx, dy, dz); - textFieldX.setText("" + (int) StateManager.getState().getCurrentShape().basePos.x); - textFieldY.setText("" + (int) StateManager.getState().getCurrentShape().basePos.y); - textFieldZ.setText("" + (int) StateManager.getState().getCurrentShape().basePos.z); + textFieldX.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.x); + textFieldY.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.y); + textFieldZ.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.z); textFieldX.setTextColor(0xFFFFFF); textFieldY.setTextColor(0xFFFFFF); textFieldZ.setTextColor(0xFFFFFF); diff --git a/src/main/java/brentmaas/buildguide/screen/ShapelistScreen.java b/src/main/java/brentmaas/buildguide/screen/ShapelistScreen.java index 2c5fd9e..65f25b6 100644 --- a/src/main/java/brentmaas/buildguide/screen/ShapelistScreen.java +++ b/src/main/java/brentmaas/buildguide/screen/ShapelistScreen.java @@ -28,7 +28,7 @@ public class ShapelistScreen extends Screen{ private int newShapeId = 0; private Button buttonClose; - private Button buttonBack = new Button(0, 0, 20, 20, new StringTextComponent("<-"), button -> Minecraft.getInstance().displayGuiScreen(new BuildGuideScreen())); + private Button buttonBack = new Button(0, 0, 20, 20, new StringTextComponent("<-"), button -> Minecraft.getInstance().setScreen(new BuildGuideScreen())); private Button buttonNewShapePrevious = new Button(0, 25, 20, 20, new StringTextComponent("<-"), button -> updateNewShape(-1)); private Button buttonNewShapeNext = new Button(120, 25, 20, 20, new StringTextComponent("->"), button -> updateNewShape(1)); private Button buttonAdd = new Button(0, 45, 140, 20, new TranslationTextComponent("screen.buildguide.add"), button -> { @@ -63,7 +63,7 @@ public class ShapelistScreen extends Screen{ private TextFieldWidget textFieldZ; private Button buttonSetX = new Button(90, 145, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldX.getText()); + int newval = Integer.parseInt(textFieldX.getValue()); int delta = newval - (int) StateManager.getState().getCurrentShape().basePos.x; for(Shape s: StateManager.getState().advancedModeShapes) { s.shiftBasepos(delta, 0, 0); @@ -75,7 +75,7 @@ public class ShapelistScreen extends Screen{ }); private Button buttonSetY = new Button(90, 165, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldY.getText()); + int newval = Integer.parseInt(textFieldY.getValue()); int delta = newval - (int) StateManager.getState().getCurrentShape().basePos.y; for(Shape s: StateManager.getState().advancedModeShapes) { s.shiftBasepos(0, delta, 0); @@ -87,7 +87,7 @@ public class ShapelistScreen extends Screen{ }); private Button buttonSetZ = new Button(90, 185, 30, 20, new TranslationTextComponent("screen.buildguide.set"), button -> { try { - int newval = Integer.parseInt(textFieldZ.getText()); + int newval = Integer.parseInt(textFieldZ.getValue()); int delta = newval - (int) StateManager.getState().getCurrentShape().basePos.z; for(Shape s: StateManager.getState().advancedModeShapes) { s.shiftBasepos(0, 0, delta); @@ -110,7 +110,7 @@ protected void init() { titleVisible = new TranslationTextComponent("screen.buildguide.visible").getString(); titleNumberOfBlocks = new TranslationTextComponent("screen.buildguide.numberofblocks").getString(); - buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().displayGuiScreen(null)); + buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().setScreen(null)); checkActive(); @@ -133,15 +133,15 @@ protected void init() { addButton(buttonSetZ); textFieldX = new TextFieldWidget(font, 40, 145, 50, 20, new StringTextComponent("")); - textFieldX.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.x : "-"); + textFieldX.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.x : "-"); textFieldX.setTextColor(0xFFFFFF); children.add(textFieldX); textFieldY = new TextFieldWidget(font, 40, 165, 50, 20, new StringTextComponent("")); - textFieldY.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.y : "-"); + textFieldY.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.y : "-"); textFieldY.setTextColor(0xFFFFFF); children.add(textFieldY); textFieldZ = new TextFieldWidget(font, 40, 185, 50, 20, new StringTextComponent("")); - textFieldZ.setText(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.z : "-"); + textFieldZ.setValue(StateManager.getState().isShapeAvailable() ? "" + (int) StateManager.getState().getCurrentShape().basePos.z : "-"); textFieldZ.setTextColor(0xFFFFFF); children.add(textFieldZ); @@ -160,20 +160,20 @@ public boolean isPauseScreen() { @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { super.render(matrixStack, mouseX, mouseY, partialTicks); - font.drawStringWithShadow(matrixStack, title.getString(), (width - font.getStringWidth(title.getString())) / 2, 5, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleNewShape, (140 - font.getStringWidth(titleNewShape)) / 2, 15, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleShapes, 150 + (150 - font.getStringWidth(titleShapes)) / 2, 15, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleGlobalBasepos, (140 - font.getStringWidth(titleGlobalBasepos)) / 2, 115, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleNumberOfBlocks, 305 + (100 - font.getStringWidth(titleNumberOfBlocks)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, title.getString(), (width - font.width(title.getString())) / 2, 5, 0xFFFFFF); + font.drawShadow(matrixStack, titleNewShape, (140 - font.width(titleNewShape)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, titleShapes, 150 + (150 - font.width(titleShapes)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, titleGlobalBasepos, (140 - font.width(titleGlobalBasepos)) / 2, 115, 0xFFFFFF); + font.drawShadow(matrixStack, titleNumberOfBlocks, 305 + (100 - font.width(titleNumberOfBlocks)) / 2, 15, 0xFFFFFF); String newShapeName = new TranslationTextComponent(ShapeRegistry.getTranslationKeys().get(newShapeId)).getString(); - font.drawStringWithShadow(matrixStack, newShapeName, 20 + (100 - font.getStringWidth(newShapeName)) / 2, 30, 0xFFFFFF); + font.drawShadow(matrixStack, newShapeName, 20 + (100 - font.width(newShapeName)) / 2, 30, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleVisible, 5, 70, StateManager.getState().isShapeAvailable() ? 0xFFFFFF : 0x444444); + font.drawShadow(matrixStack, titleVisible, 5, 70, StateManager.getState().isShapeAvailable() ? 0xFFFFFF : 0x444444); - font.drawStringWithShadow(matrixStack, "X", 5, 150, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, "Y", 5, 170, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, "Z", 5, 190, 0xFFFFFF); + font.drawShadow(matrixStack, "X", 5, 150, 0xFFFFFF); + font.drawShadow(matrixStack, "Y", 5, 170, 0xFFFFFF); + font.drawShadow(matrixStack, "Z", 5, 190, 0xFFFFFF); textFieldX.render(matrixStack, mouseX, mouseY, partialTicks); textFieldY.render(matrixStack, mouseX, mouseY, partialTicks); textFieldZ.render(matrixStack, mouseX, mouseY, partialTicks); @@ -186,21 +186,21 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia } String numberOfBlocks = "" + n; String numberOfStacks = "(" + (n / 64) + " x 64 + " + (n % 64) + ")"; - font.drawStringWithShadow(matrixStack, numberOfBlocks, 305 + (100 - font.getStringWidth(numberOfBlocks)) / 2, 30, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, numberOfStacks, 305 + (100 - font.getStringWidth(numberOfStacks)) / 2, 45, 0xFFFFFF); + font.drawShadow(matrixStack, numberOfBlocks, 305 + (100 - font.width(numberOfBlocks)) / 2, 30, 0xFFFFFF); + font.drawShadow(matrixStack, numberOfStacks, 305 + (100 - font.width(numberOfStacks)) / 2, 45, 0xFFFFFF); shapeList.render(matrixStack, mouseX, mouseY, partialTicks); } private void updateGlobalBasepos() { if(StateManager.getState().isShapeAvailable()) { - textFieldX.setText("" + (int) StateManager.getState().getCurrentShape().basePos.x); - textFieldY.setText("" + (int) StateManager.getState().getCurrentShape().basePos.y); - textFieldZ.setText("" + (int) StateManager.getState().getCurrentShape().basePos.z); + textFieldX.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.x); + textFieldY.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.y); + textFieldZ.setValue("" + (int) StateManager.getState().getCurrentShape().basePos.z); } else { - textFieldX.setText("-"); - textFieldY.setText("-"); - textFieldZ.setText("-"); + textFieldX.setValue("-"); + textFieldY.setValue("-"); + textFieldZ.setValue("-"); } textFieldX.setTextColor(0xFFFFFF); textFieldY.setTextColor(0xFFFFFF); @@ -219,7 +219,7 @@ private void shiftGlobalBasePos(int dx, int dy, int dz) { } private void setGlobalBasePos() { - Vector3d pos = Minecraft.getInstance().player.getPositionVec(); + Vector3d pos = Minecraft.getInstance().player.position(); int deltaX = (int) (Math.floor(pos.x) - StateManager.getState().getCurrentShape().basePos.x); int deltaY = (int) (Math.floor(pos.y) - StateManager.getState().getCurrentShape().basePos.y); int deltaZ = (int) (Math.floor(pos.z) - StateManager.getState().getCurrentShape().basePos.z); @@ -227,7 +227,7 @@ private void setGlobalBasePos() { } private void setShapeVisibility() { - if(StateManager.getState().isShapeAvailable()) StateManager.getState().getCurrentShape().visible = buttonVisible.isChecked(); + if(StateManager.getState().isShapeAvailable()) StateManager.getState().getCurrentShape().visible = buttonVisible.selected(); } private void checkActive() { diff --git a/src/main/java/brentmaas/buildguide/screen/VisualisationScreen.java b/src/main/java/brentmaas/buildguide/screen/VisualisationScreen.java index 08f63b9..b21c369 100644 --- a/src/main/java/brentmaas/buildguide/screen/VisualisationScreen.java +++ b/src/main/java/brentmaas/buildguide/screen/VisualisationScreen.java @@ -15,7 +15,7 @@ public class VisualisationScreen extends PropertyScreen{ private String titleBasepos; private Button buttonClose; - private Button buttonBack = new Button(0, 0, 20, 20, new StringTextComponent("<-"), button -> Minecraft.getInstance().displayGuiScreen(new BuildGuideScreen())); + private Button buttonBack = new Button(0, 0, 20, 20, new StringTextComponent("<-"), button -> Minecraft.getInstance().setScreen(new BuildGuideScreen())); private Slider sliderShapeR; private Slider sliderShapeG; private Slider sliderShapeB; @@ -39,7 +39,7 @@ protected void init() { titleShape = new TranslationTextComponent("screen.buildguide.shape").getString(); titleBasepos = new TranslationTextComponent("screen.buildguide.basepos").getString(); - buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().displayGuiScreen(null)); + buttonClose = new Button(this.width - 20, 0, 20, 20, new StringTextComponent("X"), button -> Minecraft.getInstance().setScreen(null)); sliderShapeR = new Slider(0, 35, 100, 20, new StringTextComponent("R: "), 0.0, 1.0, StateManager.getState().isShapeAvailable() ? StateManager.getState().getCurrentShape().colourShapeR : 1.0); sliderShapeG = new Slider(0, 55, 100, 20, new StringTextComponent("G: "), 0.0, 1.0, StateManager.getState().isShapeAvailable() ? StateManager.getState().getCurrentShape().colourShapeG : 1.0); @@ -129,9 +129,9 @@ public boolean isPauseScreen() { @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { super.render(matrixStack, mouseX, mouseY, partialTicks); - font.drawStringWithShadow(matrixStack, title.getString(), (width - font.getStringWidth(title.getString())) / 2, 5, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleColours, (210 - font.getStringWidth(titleColours)) / 2, 15, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleShape, (100 - font.getStringWidth(titleShape)) / 2, 25, 0xFFFFFF); - font.drawStringWithShadow(matrixStack, titleBasepos, 110 + (100 - font.getStringWidth(titleBasepos)) / 2, 25, 0xFFFFFF); + font.drawShadow(matrixStack, title.getString(), (width - font.width(title.getString())) / 2, 5, 0xFFFFFF); + font.drawShadow(matrixStack, titleColours, (210 - font.width(titleColours)) / 2, 15, 0xFFFFFF); + font.drawShadow(matrixStack, titleShape, (100 - font.width(titleShape)) / 2, 25, 0xFFFFFF); + font.drawShadow(matrixStack, titleBasepos, 110 + (100 - font.width(titleBasepos)) / 2, 25, 0xFFFFFF); } } diff --git a/src/main/java/brentmaas/buildguide/screen/widget/CheckboxRunnableButton.java b/src/main/java/brentmaas/buildguide/screen/widget/CheckboxRunnableButton.java index 270b854..16452b9 100644 --- a/src/main/java/brentmaas/buildguide/screen/widget/CheckboxRunnableButton.java +++ b/src/main/java/brentmaas/buildguide/screen/widget/CheckboxRunnableButton.java @@ -21,7 +21,7 @@ public void onPress() { public void setChecked(boolean checked) { //Why did checked have to be private ffs... At least I didn't have to do reflection by using this hack in order to get basic functionality - if(isChecked() != checked) onPress(); + if(selected() != checked) onPress(); //this.checked = checked; } diff --git a/src/main/java/brentmaas/buildguide/screen/widget/ShapeList.java b/src/main/java/brentmaas/buildguide/screen/widget/ShapeList.java index 850509b..521a66f 100644 --- a/src/main/java/brentmaas/buildguide/screen/widget/ShapeList.java +++ b/src/main/java/brentmaas/buildguide/screen/widget/ShapeList.java @@ -24,30 +24,30 @@ public ShapeList(Minecraft minecraft, int left, int right, int top, int bottom, super(minecraft, right - left, bottom - top, top, bottom, slotHeight); x0 = left; x1 = right; - func_244605_b(false); //Disable background part 1 - func_244606_c(false); //Disable background part 2 + setRenderBackground(false); + setRenderTopAndBottom(false); update = updateOnSelected; for(int shapeId = 0;shapeId < StateManager.getState().advancedModeShapes.size();++shapeId) { addEntry(new Entry(shapeId)); - if(shapeId == StateManager.getState().iAdvanced) setSelected(getEventListeners().get(getEventListeners().size() - 1)); + if(shapeId == StateManager.getState().iAdvanced) setSelected(children().get(children().size() - 1)); } } public void addEntryExternal(int shapeId) { addEntry(new Entry(shapeId)); - setSelected(getEventListeners().get(shapeId)); + setSelected(children().get(shapeId)); } public boolean removeEntry(Entry entry) { - for(Entry e: getEventListeners()) { + for(Entry e: children()) { if(e.getShapeId() > entry.getShapeId()) { e.setShapeId(e.getShapeId() - 1); } } - if(getEventListeners().size() > entry.getShapeId() + 1) setSelected(getEventListeners().get(entry.getShapeId() + 1)); - else if(getEventListeners().size() > 1) setSelected(getEventListeners().get(entry.getShapeId() - 1)); + if(children().size() > entry.getShapeId() + 1) setSelected(children().get(entry.getShapeId() + 1)); + else if(children().size() > 1) setSelected(children().get(entry.getShapeId() - 1)); return super.removeEntry(entry); } @@ -63,14 +63,14 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia if(!hasBlend) RenderSystem.enableBlend(); Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferBuilder = tessellator.getBuffer(); + BufferBuilder bufferBuilder = tessellator.getBuilder(); RenderSystem.color4f(0, 0, 0, 0.2f); bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - bufferBuilder.pos(x0, y0, 0).endVertex(); - bufferBuilder.pos(x0, y1, 0).endVertex(); - bufferBuilder.pos(x1, y1, 0).endVertex(); - bufferBuilder.pos(x1, y0, 0).endVertex(); - tessellator.draw(); + bufferBuilder.vertex(x0, y0, 0).endVertex(); + bufferBuilder.vertex(x0, y1, 0).endVertex(); + bufferBuilder.vertex(x1, y1, 0).endVertex(); + bufferBuilder.vertex(x1, y0, 0).endVertex(); + tessellator.end(); if(!hasBlend) RenderSystem.disableBlend(); @@ -91,14 +91,14 @@ protected void renderList(MatrixStack matrixStack, int p_238478_2_, int p_238478 if(!hasBlend) RenderSystem.enableBlend(); Tessellator tessellator = Tessellator.getInstance(); - BufferBuilder bufferBuilder = tessellator.getBuffer(); + BufferBuilder bufferBuilder = tessellator.getBuilder(); RenderSystem.color4f(0, 0, 0, 0); bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - bufferBuilder.pos(x0, y0 - itemHeight - 4, 0.1).endVertex(); - bufferBuilder.pos(x0, y0, 0.1).endVertex(); - bufferBuilder.pos(x1, y0, 0.1).endVertex(); - bufferBuilder.pos(x1, y0 - itemHeight - 4, 0.1).endVertex(); - tessellator.draw(); + bufferBuilder.vertex(x0, y0 - itemHeight - 4, 0.1).endVertex(); + bufferBuilder.vertex(x0, y0, 0.1).endVertex(); + bufferBuilder.vertex(x1, y0, 0.1).endVertex(); + bufferBuilder.vertex(x1, y0 - itemHeight - 4, 0.1).endVertex(); + tessellator.end(); super.renderList(matrixStack, p_238478_2_, p_238478_3_, p_238478_4_, p_238478_5_, p_238478_6_); @@ -128,7 +128,7 @@ public Entry(int shapeId) { public void render(MatrixStack matrixStack, int p_230432_2_, int top, int left, int p_230432_5_, int p_230432_6_, int p_230432_7_, int p_230432_8_, boolean p_230432_9_, float p_230432_10_) { //Found strikethrough code at https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-mods/modification-development/1437428-guide-1-7-2-how-to-make-button-tooltips?comment=3 - Minecraft.getInstance().fontRenderer.drawStringWithShadow(matrixStack, (StateManager.getState().advancedModeShapes.get(shapeId).visible ? "" : "\247m") + StateManager.getState().advancedModeShapes.get(shapeId).getTranslatedName(), left + 5, top + 4, 0xFFFFFF); + Minecraft.getInstance().font.drawShadow(matrixStack, (StateManager.getState().advancedModeShapes.get(shapeId).visible ? "" : "\247m") + StateManager.getState().advancedModeShapes.get(shapeId).getTranslatedName(), left + 5, top + 4, 0xFFFFFF); } public boolean mouseClicked(double mouseX, double mouseY, int button) { diff --git a/src/main/java/brentmaas/buildguide/screen/widget/Slider.java b/src/main/java/brentmaas/buildguide/screen/widget/Slider.java index 16f5bec..d97a591 100644 --- a/src/main/java/brentmaas/buildguide/screen/widget/Slider.java +++ b/src/main/java/brentmaas/buildguide/screen/widget/Slider.java @@ -15,23 +15,23 @@ public Slider(int x, int y, int width, int height, TextComponent name, double mi prefix = name.getString() + ": "; } - protected void func_230979_b_() { //updateMessage + protected void updateMessage() { setMessage(new StringTextComponent(prefix + Math.round(10.0 * getValue()) / 10.0)); } - protected void func_230972_a_() { //applyValue + protected void applyValue() { } public void updateSlider() { - func_230979_b_(); + updateMessage(); } public void setManualValue(double value) { - sliderValue = (value - min) / (max - min); + this.value = (value - min) / (max - min); } public double getValue() { - return sliderValue * (max - min) + min; + return value * (max - min) + min; } } diff --git a/src/main/java/brentmaas/buildguide/shapes/Shape.java b/src/main/java/brentmaas/buildguide/shapes/Shape.java index 36e27cc..40aff56 100644 --- a/src/main/java/brentmaas/buildguide/shapes/Shape.java +++ b/src/main/java/brentmaas/buildguide/shapes/Shape.java @@ -45,11 +45,11 @@ public void update() { long t = System.currentTimeMillis(); BufferBuilder builder = new BufferBuilder(4); //4 is lowest working. Number of blocks isn't always known, so it'll have to grow on its own builder.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); - builder.setDefaultColor((int) (255 * colourShapeR), (int) (255 * colourShapeG), (int) (255 * colourShapeB), (int) (255 * colourShapeA)); + builder.defaultColor((int) (255 * colourShapeR), (int) (255 * colourShapeG), (int) (255 * colourShapeB), (int) (255 * colourShapeA)); this.updateShape(builder); - builder.setDefaultColor((int) (255 * colourBaseposR), (int) (255 * colourBaseposG), (int) (255 * colourBaseposB), (int) (255 * colourBaseposA)); + builder.defaultColor((int) (255 * colourBaseposR), (int) (255 * colourBaseposG), (int) (255 * colourBaseposB), (int) (255 * colourBaseposA)); addCube(builder, 0.4, 0.4, 0.4, 0.2); //Base position - builder.finishDrawing(); + builder.end(); buffer.close(); buffer = new VertexBuffer(DefaultVertexFormats.POSITION_COLOR); buffer.upload(builder); @@ -60,49 +60,49 @@ public void update() { public void render(Matrix4f matrix) { //https://gist.github.com/gigaherz/87939db73d8adf4aace6ec7cf611bd2d - this.buffer.bindBuffer(); + buffer.bind(); DefaultVertexFormats.POSITION_COLOR.setupBufferState(0); - this.buffer.draw(matrix, GL11.GL_QUADS); - VertexBuffer.unbindBuffer(); + buffer.draw(matrix, GL11.GL_QUADS); + VertexBuffer.unbind(); DefaultVertexFormats.POSITION_COLOR.clearBufferState(); } private void addCube(BufferBuilder buffer, double x, double y, double z, double s) { //-X - buffer.pos(x, y, z).endVertex(); - buffer.pos(x, y, z+s).endVertex(); - buffer.pos(x, y+s, z+s).endVertex(); - buffer.pos(x, y+s, z).endVertex(); + buffer.vertex(x, y, z).endVertex(); + buffer.vertex(x, y, z+s).endVertex(); + buffer.vertex(x, y+s, z+s).endVertex(); + buffer.vertex(x, y+s, z).endVertex(); //-Y - buffer.pos(x, y, z).endVertex(); - buffer.pos(x+s, y, z).endVertex(); - buffer.pos(x+s, y, z+s).endVertex(); - buffer.pos(x, y, z+s).endVertex(); + buffer.vertex(x, y, z).endVertex(); + buffer.vertex(x+s, y, z).endVertex(); + buffer.vertex(x+s, y, z+s).endVertex(); + buffer.vertex(x, y, z+s).endVertex(); //-Z - buffer.pos(x, y, z).endVertex(); - buffer.pos(x, y+s, z).endVertex(); - buffer.pos(x+s, y+s, z).endVertex(); - buffer.pos(x+s, y, z).endVertex(); + buffer.vertex(x, y, z).endVertex(); + buffer.vertex(x, y+s, z).endVertex(); + buffer.vertex(x+s, y+s, z).endVertex(); + buffer.vertex(x+s, y, z).endVertex(); //+X - buffer.pos(x+s, y, z).endVertex(); - buffer.pos(x+s, y+s, z).endVertex(); - buffer.pos(x+s, y+s, z+s).endVertex(); - buffer.pos(x+s, y, z+s).endVertex(); + buffer.vertex(x+s, y, z).endVertex(); + buffer.vertex(x+s, y+s, z).endVertex(); + buffer.vertex(x+s, y+s, z+s).endVertex(); + buffer.vertex(x+s, y, z+s).endVertex(); //+Y - buffer.pos(x, y+s, z).endVertex(); - buffer.pos(x, y+s, z+s).endVertex(); - buffer.pos(x+s, y+s, z+s).endVertex(); - buffer.pos(x+s, y+s, z).endVertex(); + buffer.vertex(x, y+s, z).endVertex(); + buffer.vertex(x, y+s, z+s).endVertex(); + buffer.vertex(x+s, y+s, z+s).endVertex(); + buffer.vertex(x+s, y+s, z).endVertex(); //+Z - buffer.pos(x, y, z+s).endVertex(); - buffer.pos(x+s, y, z+s).endVertex(); - buffer.pos(x+s, y+s, z+s).endVertex(); - buffer.pos(x, y+s, z+s).endVertex(); + buffer.vertex(x, y, z+s).endVertex(); + buffer.vertex(x+s, y, z+s).endVertex(); + buffer.vertex(x+s, y+s, z+s).endVertex(); + buffer.vertex(x, y+s, z+s).endVertex(); nBlocks++; } @@ -132,7 +132,7 @@ public int getNumberOfBlocks() { } public void resetBasepos() { - Vector3d pos = Minecraft.getInstance().player.getPositionVec(); + Vector3d pos = Minecraft.getInstance().player.position(); basePos = new Vector3d(Math.floor(pos.x), Math.floor(pos.y), Math.floor(pos.z)); }