Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2a76c30
Updated to gradle 4.10.2
LemADEC Mar 14, 2022
a4b5eae
Dead code removal
LemADEC Mar 17, 2022
37e60c5
Added vanilla wrapping of isReplaceableOreGen predicates
LemADEC Mar 14, 2022
2b01130
Fixed partial ores ubification with fillers using MutableBlockPos
LemADEC Mar 14, 2022
a36d55d
Deadcode removal
LemADEC Mar 20, 2022
9ad0828
Improved build script for version configuration
LemADEC Mar 20, 2022
5112cce
Disable deployment to deprecated maven repository
LemADEC Mar 20, 2022
fc7db38
Version bump to 1.3.9
LemADEC Mar 20, 2022
043f4a8
Code cleanup
LemADEC Mar 21, 2022
a57d297
Fixed #237 slabs returning invalid drop/pick stacks
LemADEC Mar 21, 2022
ac1ea66
Fixed #237 inverted stairs returning invalid pick stacks
LemADEC Mar 21, 2022
92c8260
Fixed #233 walls have "missing texture" particle
LemADEC Mar 21, 2022
8b91ddb
Fixed #212 cobblestone recipe not showing in JEI
LemADEC Mar 21, 2022
38d5aac
Fixed #131 gravel using sand sound
LemADEC Mar 21, 2022
9508294
Version bump to 1.3.10
LemADEC Mar 21, 2022
6323223
Fixed links in Readme
LemADEC Mar 24, 2022
a4030db
Code cleanup
LemADEC Mar 26, 2022
91afe83
Added default configuration for GregTech CE: Unofficial
LemADEC Mar 24, 2022
415817a
Fixed invalid hardness for metamorphic gravel
LemADEC Mar 26, 2022
ad79dc0
Fixed invalid item drop from lignite gravel
LemADEC Mar 26, 2022
9f1367d
Version bump to 1.3.11
LemADEC Mar 26, 2022
eb9fc68
Fixed #1 dimension exclusion list only account for loaded dimensions
LemADEC May 25, 2022
1fec536
Code cleanup
LemADEC May 26, 2022
c687b63
Refactor stone replacement logic
LemADEC May 26, 2022
44713b1
Version bump to 1.3.12
LemADEC May 27, 2022
6d79bc8
Fixed #2 intermittent crash when replacing slab & wall
LemADEC Jun 11, 2022
48882bc
Fixed #3 server crash due to invalid logger
LemADEC Jun 11, 2022
09676dd
Code cleanup
LemADEC Jun 11, 2022
bb4b134
Version bump to 1.3.13
LemADEC Jun 11, 2022
8fef38a
Fixed #4 intermittent crash when replacing slab
LemADEC Jun 14, 2022
d85fea0
Version bump to 1.3.14
LemADEC Jun 14, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ build
# other
eclipse
run

output/
28 changes: 0 additions & 28 deletions CREDITS-fml.txt

This file was deleted.

26 changes: 0 additions & 26 deletions MinecraftForge-Credits.txt

This file was deleted.

40 changes: 0 additions & 40 deletions Paulscode SoundSystem CodecIBXM License.txt

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# UndergroundBiomes

[![Build Status - 1.12.2](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.altillimity.com%2Fjob%2FUnderground%2520Biomes%2F)](https://jenkins.altillimity.com/job/Underground%20Biomes/) [![Discord](https://img.shields.io/discord/479711261274406913.svg?logo=discord&label=)](https://discord.gg/kpJEnAf)
[![Discord](https://img.shields.io/discord/96753964485181440.svg?logo=discord&label=Kreezcraft)](https://discord.gg/ngNQjT5) [![Discord](https://img.shields.io/discord/102776848185847808.svg?logo=discord&label=FunSquareGames)](https://discord.gg/0ZanfS3S9yu3Wf2M)

For Minecraft 1.12+
CurseForge : https://minecraft.curseforge.com/projects/underground-biomes
For Minecraft 1.12+, based on UndergroundBiomesConstruct
CurseForge : https://minecraft.curseforge.com/projects/underground-biomes
54 changes: 38 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
url = "https://files.minecraftforge.net/maven"
}
}
dependencies {
Expand All @@ -14,38 +14,53 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven'

version = "1.3.8"
// define the properties file
ext.configFile = file "build.properties"

def env = System.getenv()
if (env.BUILD_NUMBER) {
version = version + "-" + "${env.BUILD_NUMBER}"
configFile.withReader {
// read config. it shall from now on be referenced as simply config or as project.config
def prop = new Properties()
prop.load(it)
ext.config = new ConfigSlurper().parse prop
}

group = "exterminatorjeff.undergroundbiomes" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
// version = "${config.minecraft_version}-${config.mod_version}.${System.getenv("BUILD_NUMBER") ?: 'SNAPSHOT'}"
version = "${config.mod_version}"
archivesBaseName = "UndergroundBiomesConstructs-1.12"

sourceCompatibility = targetCompatibility = "1.8" // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = "1.8"
def env = System.getenv()
if (env.BUILD_NUMBER) {
version = version + "-" + "${env.BUILD_NUMBER}"
}

// Enforce Java version explicitly so eclipse task generates correctly.
sourceCompatibility = compileJava.sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = compileJava.targetCompatibility = JavaVersion.VERSION_1_8

minecraft {
version = "1.12.2-14.23.5.2847"
version = config.minecraft_version + "-" + config.forge_version
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "stable_39"
mappings = "${config.mappings_version}"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

// replacing
replace "@version@", project.version
replaceIn "ModInfo.java"
}

repositories {
mavenCentral()
maven {
url = "https://maven.blamejared.com"
}
// mavenLocal()
}

dependencies {
Expand All @@ -59,10 +74,6 @@ dependencies {
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env

// the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
provided files('libs/toolprogression.jar')
provided "vazkii.quark:Quark:r1.5-153.168"
provided "vazkii.autoreglib:AutoRegLib:1.3-29.24"
provided files('libs/dynamictrees.jar')
// the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
// except that these dependencies get remapped to your current MCP mappings
//deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
Expand All @@ -72,19 +83,23 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

provided files('libs/toolprogression.jar')
provided "vazkii.quark:Quark:${config.Quark_version}"
provided "vazkii.autoreglib:AutoRegLib:${config.AutoRegLib_version}"
provided files('libs/dynamictrees.jar')
}

processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
inputs.property "mcversion", config.minecraft_version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version': project.version, 'mcversion': project.minecraft.version
expand 'version': project.version, 'mcversion': config.minecraft_version
}

// copy everything else, thats not the mcmod.info
Expand All @@ -95,6 +110,12 @@ processResources {

apply from: 'asset_templates.gradle'

jar {
classifier = ''
destinationDir = file 'output'
}

/*
uploadArchives {
repositories {
mavenDeployer {
Expand All @@ -107,3 +128,4 @@ uploadArchives {
}
}
}
*/
9 changes: 9 additions & 0 deletions build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
minecraft_version=1.12.2
mappings_version=stable_39
forge_version=14.23.5.2847

AutoRegLib_version=1.3-29.24
Quark_version=r1.5-153.168

mod_version=1.3.14
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
Loading