Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/Multiloader-1.19' into M…
Browse files Browse the repository at this point in the history
…ultiloader-1.18
  • Loading branch information
fayer3 committed Oct 12, 2023
2 parents da95f67 + add7179 commit 9567d93
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:

- name: publish fabric
if: steps.assets.outputs.FABRIC_FILE_PATH != ''
uses: Kir-Antipov/mc-publish@v3.2
uses: Kir-Antipov/mc-publish@v3.3
with:
modrinth-id: wGoQDPN5
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
Expand All @@ -203,7 +203,7 @@ jobs:

- name: publish forge
if: steps.assets.outputs.FORGE_FILE_PATH != ''
uses: Kir-Antipov/mc-publish@v3.2
uses: Kir-Antipov/mc-publish@v3.3
with:
modrinth-id: wGoQDPN5
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
Expand All @@ -223,7 +223,7 @@ jobs:

- name: publish quilt
if: steps.assets.outputs.QUILT_FILE_PATH != ''
uses: Kir-Antipov/mc-publish@v3.2
uses: Kir-Antipov/mc-publish@v3.3
with:
modrinth-id: wGoQDPN5
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Collections;
import java.util.List;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;

public class SettingsList extends ContainerObjectSelectionList<SettingsList.BaseEntry> {
final Screen parent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,8 @@ void readPalette(DataInputStream dis) throws IOException {

boolean hasPrecipitation = dis.readBoolean();
float temperature = dis.readFloat();
builder.temperature(temperature);
builder.precipitation(hasPrecipitation ? (temperature < 0.15f ? Biome.Precipitation.SNOW : Biome.Precipitation.RAIN) : Biome.Precipitation.NONE);
builder.temperature(temperature);
builder.biomeCategory(Biome.BiomeCategory.NONE);
decodeEnum(Biome.TemperatureModifier.class, dis.readUTF()).ifPresent(builder::temperatureAdjustment);
builder.downfall(dis.readFloat());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,6 @@ String getDisplayString(String prefix, Object value) {
} else {
return prefix + String.format("%.1f", (float) value) + "s";
}

}
},
MIXED_REALITY_KEY_COLOR(false, false) { // Key Color
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
this.mainRenderTarget.bindWrite(true);

// draw screen/gui to buffer
// push pose so we can pop it later
RenderSystem.getModelViewStack().pushPose();
((GameRendererExtension) this.gameRenderer).vivecraft$setShouldDrawScreen(true);
// only draw the gui when the level was rendered once, since some mods expect that
Expand Down Expand Up @@ -398,6 +399,10 @@ public abstract class MinecraftVRMixin implements MinecraftExtension {
// reset that, do not draw it again on something else
fpsPieResults = null;

// pop pose that we pushed before the gui
RenderSystem.getModelViewStack().popPose();
RenderSystem.applyModelViewMatrix();

// generate mipmaps
// TODO: does this do anything?
mainRenderTarget.bindRead();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class RenderSystemVRMixin {
ci.cancel();
}

@Inject(at = @At("HEAD"), method = "limitDisplayFPS", cancellable = true, remap = false)
@Inject(at = @At("HEAD"), method = "limitDisplayFPS", cancellable = true)
private static void vivecraft$noFPSlimit(CallbackInfo ci) {
if (VRState.vrRunning) {
ci.cancel();
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ minecraft_version=1.18.2
enabled_platforms=fabric,forge

archives_base_name=vivecraft
mod_version=1.1.0
mod_version=1.1.2
maven_group=org.vivecraft

architectury_version=4.11.93
Expand Down

0 comments on commit 9567d93

Please sign in to comment.