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.

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

Fix Scaling of GT Ore Veins and TC Nodes on Journeymap #47

Merged
merged 2 commits into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
dependencies {
shadowImplementation('com.github.GTNewHorizons:Enklume:2.1.0:dev')

api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.37:dev')
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.56:dev')
api(rfg.deobf('maven.modrinth:journeymap:5.2.3'))

devOnlyNonPublishable('com.github.GTNewHorizons:TCNodeTracker:1.2.0:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:TCNodeTracker:1.3.0:dev')

compileOnly(deobfCurse('xaeros-minimap-263420:4905582'))
compileOnly(deobfCurse('xaeros-world-map-317780:4905612'))
compileOnly(deobf('https://media.forgecdn.net/files/2462/146/mod_voxelMap_1.7.0b_for_1.7.10.litemod', 'mod_voxelMap_1.7.0b_for_1.7.10.jar'))

// For debugging
runtimeOnlyNonPublishable('com.github.GTNewHorizons:DetravScannerMod:1.8.1:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.0.51:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.0.60:dev')
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
}


Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public IWaypointAndLocationProvider getLocationProvider() {
@Override
public void draw(double draggedPixelX, double draggedPixelY, GridRenderer gridRenderer, float drawScale,
double fontScale, double rotation) {
iconSize = 32 * fontScale;
iconSize = 32 * drawScale;
final double iconSizeHalf = iconSize / 2;
final Point2D.Double blockAsPixel = gridRenderer
.getBlockPixelInGrid(oreVeinLocation.getBlockX(), oreVeinLocation.getBlockZ());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ThaumcraftNodeDrawStep(ThaumcraftNodeLocation thaumcraftNodeLocation) {
@Override
public void draw(double draggedPixelX, double draggedPixelY, GridRenderer gridRenderer, float drawScale,
double fontScale, double rotation) {
final double borderSize = 44 * fontScale;
final double borderSize = 44 * drawScale;
final double borderSizeHalf = borderSize / 2;
final Point2D.Double blockAsPixel = gridRenderer
.getBlockPixelInGrid(thaumcraftNodeLocation.getBlockX(), thaumcraftNodeLocation.getBlockZ());
Expand Down