Skip to content

Commit

Permalink
Merge pull request #2 from jan-br/master
Browse files Browse the repository at this point in the history
improve .gitignore, replace build gradle with kotlin dsl, add gradle run configuration
  • Loading branch information
LabyStudio authored Mar 10, 2021
2 parents a65edc4 + ecde8ca commit 1e0391c
Show file tree
Hide file tree
Showing 9 changed files with 189 additions and 31 deletions.
142 changes: 129 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,131 @@
.classpath
.project
.settings/*
.idea
/bin/
.idea
out
# Created by .ignore support plugin (hsz.mobi)
### Java template
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
.idea/**/misc.xml
.idea/**/discord.xml
.idea/**/encodings.xml
.idea/codeStyles/
.idea/sonarlint/

# Generated files
.idea/**/contentModel.xml
.idea/**/jarRepositories.xml
.idea/**/uiDesigner.xml
.idea/**/inspectionProfiles
.idea/**/.name
.idea/**/vcs.xml
.idea/**/compiler.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/dbnavigator.xml
.idea/kotlinScripting.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
.idea/modules.xml
.idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Gradle template
.gradle
*.iml
build
/**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Cache of project
.gradletasknamecache

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

.idea/.gitignore
.idea/modules/
src/main/resources/
src/test/
**/src/main/generated/*

# Exclude run except natives
!run/
run/*
!run/natives/
.idea/intellij-javadocs-4.0.1.xml
run
23 changes: 23 additions & 0 deletions .idea/runConfigurations/Run_Client.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ it is possible to recreate the unreleased version.

## Setup
1. Clone the project
2. Set the VM option ``-Dorg.lwjgl.librarypath="<path_to_project>/run/natives"``
3. Set the working directory to ``./run``
2. Execute the gradle task ``run``
16 changes: 0 additions & 16 deletions build.gradle

This file was deleted.

36 changes: 36 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
plugins {
id("java-library")
}

group = "net.minecraft"
version = "rd-131655"

repositories {
mavenCentral()
}

val natives: Configuration by configurations.creating
natives.isTransitive = true

dependencies {
implementation(group = "org.lwjgl.lwjgl", name = "lwjgl", version = "2.9.3")
implementation(group = "org.lwjgl.lwjgl", name = "lwjgl_util", version = "2.9.3")
natives(group = "org.lwjgl.lwjgl", name = "lwjgl-platform", version = "2.9.3", classifier = "natives-windows")
natives(group = "org.lwjgl.lwjgl", name = "lwjgl-platform", version = "2.9.3", classifier = "natives-linux")
natives(group = "org.lwjgl.lwjgl", name = "lwjgl-platform", version = "2.9.3", classifier = "natives-osx")
}


task("run", JavaExec::class) {
jvmArgs = listOf("-Dorg.lwjgl.librarypath=${project.projectDir.toPath()}\\run\\natives")
main = "com.mojang.rubydung.RubyDung"
classpath = sourceSets["main"].runtimeClasspath
workingDir("${project.projectDir.toPath()}\\run")
dependsOn("extractNatives")
}

task("extractNatives", Copy::class) {
dependsOn(natives)
from(natives.map { zipTree(it) })
into("${project.projectDir.toPath()}\\run\\natives")
}
Binary file removed run/natives/OpenAL32.dll
Binary file not shown.
Binary file removed run/natives/OpenAL64.dll
Binary file not shown.
Binary file removed run/natives/lwjgl.dll
Binary file not shown.
Binary file removed run/natives/lwjgl64.dll
Binary file not shown.

0 comments on commit 1e0391c

Please sign in to comment.