Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed server-sided Limbo music

Browse source 
-Fixed #35
-Changed the versioning format of jar files.
-Made Travis upload everything in the build folder.
This commit is contained in:
Robijnvogel 2018-01-19 07:59:56 +01:00
parent 6a5321c35b
commit 3d23749f34
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -5,7 +5,7 @@ if: tag IS blank
before_install: chmod +x gradlew before_install: chmod +x gradlew
install: "./gradlew setupCIWorkspace" install: "./gradlew setupCIWorkspace"
script: "./gradlew build" script: "./gradlew clean build"
jdk: jdk:
- oraclejdk8 - oraclejdk8
before_cache: before_cache:
@ -21,7 +21,7 @@ deploy:
provider: releases provider: releases
api_key: api_key:
secure: A26twoR4XbarXTCxNIlKr4zbDRw6B+u879+6BWEKmavgAnjhGkPb9PkmR3tPm7iQDp9K9dlkez5KGUJEX/tCMYqL2gQnjlt9BfcVu7YJ4SXhZ6Zcck1/+1jhDox8QHLT2zvgYhmmEWdDD78FHJfO+2+ejhdxDMt6xxVtn47426rs0d0I1L9KDlC8EVoe42c+142Dedk5IaI2GCU07nOKaZFtAnR0NIk/Cf5P7rtecd+jNR3kaAu24U/WPoUMH2cCCf1+ViK/oJgu4FgdEGp1kec0gZnwWqJ+bYvywGiohmbN9B0JsjrwVixYgmzEw00cvdcV8uZHY/RXfOVtDh3ex9xaQYu6Fiq7L8pnw/pN6wsr7kFE0HvhSDAILIAOHFt5jlocAUfjEV/wFQyZUhxZx6Qclx7rdwYt4+iwtB+DPXR71JaaeSLtuQ7Q6HbFxrnjo1biS2ERkdOJobNBHEZvH2A9O1+bx4q9z1+LAP/XXxK2+KpzVZzkDXVUMl81oyAycuipXZQVTyDQdp9XB+waj7xclL57Cibs/DfwOw9l8DKR981h2Q784jBVlJyv/s+vZDgouxLqeTJdsK2cKOuYKl/fMhio6FIJs7p8U7l2OiXbvAg5jY1sJj69ePn7hTiMn2QHVihVM0t3W3/ppp7U0XKo++hB2VXwT/fSS8E5aXs= secure: A26twoR4XbarXTCxNIlKr4zbDRw6B+u879+6BWEKmavgAnjhGkPb9PkmR3tPm7iQDp9K9dlkez5KGUJEX/tCMYqL2gQnjlt9BfcVu7YJ4SXhZ6Zcck1/+1jhDox8QHLT2zvgYhmmEWdDD78FHJfO+2+ejhdxDMt6xxVtn47426rs0d0I1L9KDlC8EVoe42c+142Dedk5IaI2GCU07nOKaZFtAnR0NIk/Cf5P7rtecd+jNR3kaAu24U/WPoUMH2cCCf1+ViK/oJgu4FgdEGp1kec0gZnwWqJ+bYvywGiohmbN9B0JsjrwVixYgmzEw00cvdcV8uZHY/RXfOVtDh3ex9xaQYu6Fiq7L8pnw/pN6wsr7kFE0HvhSDAILIAOHFt5jlocAUfjEV/wFQyZUhxZx6Qclx7rdwYt4+iwtB+DPXR71JaaeSLtuQ7Q6HbFxrnjo1biS2ERkdOJobNBHEZvH2A9O1+bx4q9z1+LAP/XXxK2+KpzVZzkDXVUMl81oyAycuipXZQVTyDQdp9XB+waj7xclL57Cibs/DfwOw9l8DKR981h2Q784jBVlJyv/s+vZDgouxLqeTJdsK2cKOuYKl/fMhio6FIJs7p8U7l2OiXbvAg5jY1sJj69ePn7hTiMn2QHVihVM0t3W3/ppp7U0XKo++hB2VXwT/fSS8E5aXs=
file: "./build/libs/dimdoors.jar" file: ./build/libs/*
on: on:
repo: DimensionalDevelopment/DimDoors repo: DimensionalDevelopment/DimDoors
branch: 1.12-WIP branch: 1.12-WIP

10
build.gradle
View file

@ -21,8 +21,8 @@ repositories {
} }
// Version info // Version info
String baseversion = "3.0.0" // Set beta to 0 after changing this String baseversion = "3.0" // Set beta to 0 after changing this
int beta = 5 // Set this to 0 for a non-beta release int beta = 5.2 // Set this to 0 for a non-beta release
ext.mcversion = "1.12.2" ext.mcversion = "1.12.2"
ext.forgeversion = "14.23.1.2598" ext.forgeversion = "14.23.1.2598"
String mcpversion = "snapshot_20180113" String mcpversion = "snapshot_20180113"
@ -30,7 +30,7 @@ String mcpversion = "snapshot_20180113"
String suffix = "" String suffix = ""
String shortSuffix = "" String shortSuffix = ""
if (beta != 0) { if (beta != 0) {
suffix += "-beta$beta" suffix += ".$beta" + "-b"
shortSuffix = suffix shortSuffix = suffix
if (System.getenv("TRAVIS_BUILD_NUMBER") != null && beta != 0) { if (System.getenv("TRAVIS_BUILD_NUMBER") != null && beta != 0) {
suffix += "+${System.getenv("TRAVIS_BUILD_NUMBER")}" suffix += "+${System.getenv("TRAVIS_BUILD_NUMBER")}"
@ -41,8 +41,8 @@ if (beta != 0) {
version = ext.modversion = baseversion + suffix version = ext.modversion = baseversion + suffix
group = "org.dimdev.dimdoors" group = "org.dimdev.dimdoors"
archivesBaseName = "dimdoors" archivesBaseName = "Dimdoors"
jar.archiveName = "dimdoors.jar" // Constant name for travis jar.archiveName = "Dimdoors-" + version + ".jar" // Constant name for travis
sourceCompatibility = "1.8" sourceCompatibility = "1.8"
compileJava { compileJava {

7
src/main/java/org/dimdev/dimdoors/shared/world/limbo/WorldProviderLimbo.java
View file

@ -24,7 +24,12 @@ import org.dimdev.dimdoors.shared.world.ModDimensions;
public class WorldProviderLimbo extends WorldProvider { public class WorldProviderLimbo extends WorldProvider {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
private static final MusicTicker.MusicType music = DimDoors.proxy.isClient() ? EnumHelper.addEnum(MusicTicker.MusicType.class, "limbo", new Class<?>[] {SoundEvent.class, int.class, int.class}, ModSounds.CREEPY, 0, 0) : null; public static MusicTicker.MusicType music;
static {
if (DimDoors.proxy.isClient()) {
music = EnumHelper.addEnum(MusicTicker.MusicType.class, "limbo", new Class<?>[] {SoundEvent.class, int.class, int.class}, ModSounds.CREEPY, 0, 0);
}
}
@Override @Override
public void init() { public void init() {