Skip to content

Commit

Permalink
Upgrade build config to recommanded 1.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Lythom committed Nov 15, 2017
1 parent 6b2e3d4 commit 7b1ab5a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 30 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,10 @@ Blocks :

## Planned ##

* TODO : fix case where world or thrower is not available (thrown by a dropper ?)
* TODO : Fix case where capture / resent fails./by Instead of brutally aborting, :
reverse to initial situation ?
continue and ignore crashing block ?
* Grieffing protection : plug-in to the claim chunk system | config force block @corners (so if all 4 blocks can't be placed the content can't be captured) | protective block.
* Blueprint capsules that can be loaded with material and then spawn several times the same pattern
* Capsule shirts, Capsules banner logo (idea of AlexisMachina)
21 changes: 6 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ archivesBaseName = "Capsule"

minecraft {
version = config.minecraft_version + "-" + config.forge_version
runDir = "run"
runDir = "r:\\run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
Expand Down Expand Up @@ -78,32 +78,23 @@ dependencies {

}

sourceSets {
main {
resources {
srcDir 'resources'
}
}
}
processResources {

inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

from(sourceSets.main.resources.srcDirs) {
include '**/*.info'
include '**/*.properties'
include 'mcmod.info'

// replaces
expand ([
'modid': 'capsule',
'mod_version': project.version,
'minecraft_version': project.minecraft.version
'version': project.version,
'mcversion': project.minecraft.version
])
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude '**/*.info'
exclude '**/*.properties'
exclude 'mcmod.info'
}
}
8 changes: 4 additions & 4 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
minecraft_version=1.10.2
forge_version=12.18.1.2011
jei_version=3.7.+
mappings=snapshot_20160701
capsule_version=1.2.0
forge_version=12.18.3.2185
jei_version=3.13.6.+
mappings=snapshot_20161111
capsule_version=1.3.0
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Sep 14 12:28:28 PDT 2015
#Sun Jul 02 18:56:32 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
15 changes: 6 additions & 9 deletions run/config/forge.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
client {
# Replace the vanilla bucket models with Forges own dynamic bucket model. Unifies bucket visuals if a mod uses the Forge bucket model.
B:replaceVanillaBucketModel=false

# The timestamp of the last reminder to update to Java 8 in number of milliseconds since January 1, 1970, 00:00:00 GMT. Nag will show only once every 24 hours. To disable it set this to some really high number.
D:java8Reminder=1465032796415

# Disable culling of hidden faces next to stairs and slabs. Causes extra rendering, but may fix some resource packs that exploit this vanilla mechanic.
B:disableStairSlabCulling=false
}


Expand Down Expand Up @@ -53,22 +58,14 @@ general {
# Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic.
D:zombieBabyChance=0.05

# The spawn fuzz when a player respawns in the world, this is controllable by WorldType, this config option is for the default overworld.
I:defaultSpawnFuzz=20

# If the overworld has ANY spawn fuzz at all. If not, the spawn will always be the exact same location.
B:spawnHasFuzz=true

# Enable the forge block rendering pipeline - fixes the lighting of custom models.
B:forgeLightPipelineEnabled=true

# Set this to just disable the texture stitcher from writing the '{name}_{mipmap}.png files to disc. Just a small performance tweak. Default: true
B:disableStitchedFileSaving=true
B:enableGlobalConfig=false
}


version_checking {
# Enable the entire mod update check system. This only applies to mods using the Forge system.
B:Global=true
B:Forge=true
}
Expand Down

0 comments on commit 7b1ab5a

Please sign in to comment.