Skip to content

Commit

Permalink
Update to forge 1.12.2-14.23.5.2768 and JEI 4.15.0.268
Browse files Browse the repository at this point in the history
  • Loading branch information
Lythom committed May 14, 2019
1 parent 047ab6f commit 627c92b
Show file tree
Hide file tree
Showing 22 changed files with 94 additions and 69 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ environment {
steps {
sh "rm build/libs/*.jar || true"
git branch: "${env.BRANCH}", url: 'https://github.com/Lythom/capsule.git'
sh "sed -i 's/BUILD_ID/${env.BUILD_ID}/g' build.properties"
sh "sed -i 's/BUILD_ID/${env.BUILD_ID}/g' build.gradle"
sh '/gradlew build --stacktrace'
}
}
Expand Down
6 changes: 3 additions & 3 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
git checkout HEAD -- build.properties
sed -i 's/BUILD_ID/dev/g' build.properties
git checkout HEAD -- build.gradle
sed -i 's/BUILD_ID/dev/g' build.gradle
SET GRADLE_OPTS="-Dfile.encoding=UTF-8"
gradlew build --stacktrace
git checkout HEAD -- build.properties
git checkout HEAD -- build.gradle
35 changes: 16 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@

def build_version="BUILD_ID"
def capsule_version="3.1"
def minecraft_version="1.12.2"
def forge_version="14.23.5.2768"
def jei_version="4.15.0.268"

// For those who want the bleeding edge
buildscript {
repositories {
mavenCentral()
mavenLocal()
jcenter()
maven {
name = "forge"
Expand All @@ -15,27 +20,19 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'


// External properties
ext.configFile = file "build.properties"
configFile.withReader {
// Load config. It shall from now be referenced as simply config or project.config
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

version = config.minecraft_version + "-" + config.capsule_version + "." + config.build_version
version = "${minecraft_version}-${capsule_version}-${build_version}"
group= "fr.samuelbouchet.capsule" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Capsule"


minecraft {
version = config.minecraft_version + "-" + config.forge_version
runDir = "r:\\run"
version = "${minecraft_version}-${forge_version}"
runDir = "C:\\projets\\capsule\\run"

replace "@VERSION@", project.version
replaceIn "Main.java"
Expand All @@ -45,7 +42,7 @@ minecraft {
// 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 = config.mappings
mappings = "snapshot_20171003"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down Expand Up @@ -77,8 +74,8 @@ dependencies {
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}:api"
runtime "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}"
deobfCompile "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
}

processResources {
Expand Down
6 changes: 0 additions & 6 deletions build.properties

This file was deleted.

3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
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 @@
#Tue Nov 21 17:59:49 CET 2017
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
67 changes: 41 additions & 26 deletions run/config/forge.cfg
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
# Configuration file

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
# Toggle off to make missing model text in the gui fit inside the slot.
B:zoomInMissingModelTextInGui=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
# Enable uploading cloud geometry to the GPU for faster rendering.
B:forgeCloudsEnabled=true

# 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
}


general {
# Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.
B:disableVersionCheck=false

# Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024
I:clumpingThreshold=64

# Set to true to enable the post initialization sorting of crafting recipes using Forge's sorter. May cause desyncing on conflicting recipes. MUST RESTART MINECRAFT IF CHANGED FROM THE CONFIG GUI.
B:sortRecipies=true

# Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
B:removeErroringEntities=false

# Set this to true to remove any TileEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
B:removeErroringTileEntities=false

# Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticeable differences in mechanics so default is vanilla behavior. Default: false
B:fullBoundingBoxLadders=false
# Enable forge to queue all chunk updates to the Chunk Update thread. May increase FPS significantly, but may also cause weird rendering lag. Not recommended for computers without a significant number of cores available.
B:alwaysSetupTerrainOffThread=false

# Control the range of sky blending for colored skies in biomes.
I:biomeSkyBlendRange <
Expand All @@ -52,14 +34,47 @@ general {
34
>

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

# When enabled, makes specific reload tasks such as language changing quicker to run.
B:selectiveResourceReloadEnabled=false
}


general {
# Set to true to disable Forge's version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.
B:disableVersionCheck=false

# Controls the number threshold at which Packet51 is preferred over Packet52, default and minimum 64, maximum 1024
I:clumpingThreshold=64

# Set to true to enable the post initialization sorting of crafting recipes using Forge's sorter. May cause desyncing on conflicting recipes. MUST RESTART MINECRAFT IF CHANGED FROM THE CONFIG GUI.
B:sortRecipies=true

# Set this to true to remove any Entity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
B:removeErroringEntities=false

# Set this to true to remove any TileEntity that throws an error in its update method instead of closing the server and reporting a crash log. BE WARNED THIS COULD SCREW UP EVERYTHING USE SPARINGLY WE ARE NOT RESPONSIBLE FOR DAMAGES.
B:removeErroringTileEntities=false

# Set this to true to check the entire entity's collision bounding box for ladders instead of just the block they are in. Causes noticeable differences in mechanics so default is vanilla behavior. Default: false
B:fullBoundingBoxLadders=false

# Base zombie summoning spawn chance. Allows changing the bonus zombie summoning mechanic.
D:zombieBaseSummonChance=0.1

# Chance that a zombie (or subclass) is a baby. Allows changing the zombie spawning mechanic.
D:zombieBabyChance=0.05

# Enable the forge block rendering pipeline - fixes the lighting of custom models.
B:forgeLightPipelineEnabled=true
# Log cascading chunk generation issues during terrain population.
B:logCascadingWorldGeneration=true

# Fix vanilla issues that cause worldgen cascading. This DOES change vanilla worldgen so DO NOT report bugs related to world differences if this flag is on.
B:fixVanillaCascading=false

# The time in ticks the server will wait when a dimension was queued to unload. This can be useful when rapidly loading and unloading dimensions, like e.g. throwing items through a nether portal a few time per second.
I:dimensionUnloadQueueDelay=0
B:enableGlobalConfig=false
}

Expand Down
34 changes: 22 additions & 12 deletions run/config/forgeChunkLoading.cfg
Original file line number Diff line number Diff line change
@@ -1,19 +1,7 @@
# Configuration file

##########################################################################################################
# Forge
#--------------------------------------------------------------------------------------------------------#
# Sample mod specific control section.
# Copy this section and rename the with the modid for the mod you wish to override.
# A value of zero in either entry effectively disables any chunkloading capabilities
# for that mod
##########################################################################################################

Forge {
# Maximum chunks per ticket for the mod.
I:maximumChunksPerTicket=25

# Maximum ticket count for the mod. Zero disables chunkloading capabilities.
I:maximumTicketCount=200
}

Expand Down Expand Up @@ -42,6 +30,28 @@ defaults {
# Unloaded chunks can first be kept in a dormant cache for quicker
# loading times. Specify the size (in chunks) of that cache here
I:dormantChunkCacheSize=0

# Load chunks asynchronously for players, reducing load on the server thread.
# Can be disabled to help troubleshoot chunk loading issues.
B:asyncChunkLoading=true
}


##########################################################################################################
# forge
#--------------------------------------------------------------------------------------------------------#
# Sample mod specific control section.
# Copy this section and rename the with the modid for the mod you wish to override.
# A value of zero in either entry effectively disables any chunkloading capabilities
# for that mod
##########################################################################################################

forge {
# Maximum chunks per ticket for the mod.
I:maximumChunksPerTicket=25

# Maximum ticket count for the mod. Zero disables chunkloading capabilities.
I:maximumTicketCount=200
}


6 changes: 6 additions & 0 deletions src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"pack": {
"pack_format": 3,
"description": "Resources used for Capsule mod"
}
}

0 comments on commit 627c92b

Please sign in to comment.