Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Turkish Translation #96

Open
wants to merge 119 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
466af3d
Adding French Canadian language
DragonsLover May 3, 2015
f11148c
update to 1.8.9
progwml6 Jan 12, 2016
edb3454
pull in additional tweaks from cpw
progwml6 Jan 12, 2016
b5b8ec9
Merge branch 'master' of https://github.com/cpw/ironchest
progwml6 Jan 13, 2016
b50c6eb
add curse support
progwml6 Jan 18, 2016
c2646a5
change versioning code so that curse forge builds are labeled the sam…
progwml6 Jan 19, 2016
0277783
Added support for Inventory Tweaks
cabralRodrigo Jan 28, 2016
0fd665a
Merge pull request #56 from cabralRodrigo/master
progwml6 Jan 28, 2016
1b527d4
Add thirdperson display tag.
Feb 4, 2016
c4d5a56
Merge pull request #58 from 61352151511/master
progwml6 Feb 4, 2016
2b95aab
Update IronChests to 1.9!
alexbegt Mar 21, 2016
3b123b2
Break Particles
Drullkus Mar 23, 2016
dcc1c1b
Merge pull request #62 from Drullkus/master
Mar 24, 2016
1aa5f2e
Working Particles
alexbegt Mar 24, 2016
8be3c5e
Fix crash with forge 1809.
alexbegt Mar 26, 2016
0aae1ff
Fix #64, only call the event on the client.
alexbegt Mar 26, 2016
a4184e6
Update IronChests to new Forge with the registry changes.
alexbegt Apr 2, 2016
d0b721e
Fix some formatter issues and update forge and mappings.
alexbegt Apr 21, 2016
8fcccc4
Absolutely barbaric rewrite
LatvianModder May 18, 2016
96ecbab
Added blockstates, fixed block particles, item localizations and item…
LatvianModder May 19, 2016
158ad6d
Fixed missing copperIronUpgrade texture and ItemChestChanger breaking…
LatvianModder May 19, 2016
86594d3
Merge pull request #68 from LatvianModder/master
May 19, 2016
94aa167
Fix some bugs from the PR.
May 19, 2016
644b169
Update to 1.9.4
May 19, 2016
566efca
Update Forge required and minecraft version.
May 19, 2016
6e4188f
This should fix #69, I couldn't recreate the crash so it needs to be …
May 30, 2016
5d607a0
Fix #71, Chest orientation will now stay the same after a Chunk Unload.
Jun 8, 2016
bb8cb4f
Fix #72, Chests now work while as a spectator.
Jun 12, 2016
4d145cd
Ocelots now sit on top of IronChests again!
Jun 12, 2016
efd5046
This might fix the crashes that happen on death.
Jun 13, 2016
53d563f
Fix Authors List in the mcmod.info
Jun 23, 2016
3321ba2
Add support for 1.10!
Jun 23, 2016
e718cae
Bump forge version to fix dupe bug with items while running deobf tes…
Jun 23, 2016
cc78de2
Remove unneeded Event Handler.
Jul 1, 2016
7c8d398
Switch back to the way 1.7.10 did chest upgrades, you do not have to …
Jul 3, 2016
cac7322
Add support for loot tables, fix #76.
Jul 3, 2016
29ef3a5
Update to 1.10.2!
Jul 7, 2016
0606ced
Change to newer forge!
Jul 16, 2016
6ce2967
Make modid lowercase
AfterRebelion Aug 6, 2016
9641acc
Merge pull request #79 from AfterRebelion/master
Aug 6, 2016
07510cf
Merge pull request #42 from DragonsLover/master
progwml6 Sep 20, 2016
a43c725
start of 1.11 update
progwml6 Nov 16, 2016
9fe6c69
Work on the 1.11 update more, some is still buggy but nearly complete.
Nov 17, 2016
e6fb331
Add JEI to the dev environment, rename the items + blocks to match va…
Nov 18, 2016
ea5f847
Remove dead code that has been commended out.
Nov 18, 2016
5720fa2
Update mappings for Iron Chests, and rename some parameters.
Nov 19, 2016
e5e601a
Fix IronChest's version check + Fix the dirt chest's book.
Nov 19, 2016
9515e68
Update Iron Chests to 1.11.2!
Mar 5, 2017
82f9d7c
Fix Crystal Chest's crashing clients with ArrayIndexOutOfBoundsExcept…
May 17, 2017
0ce5748
Add Iron Shulker Boxes, which function just like regular shulker boxe…
Jun 11, 2017
f2c6dc9
I have no idea what git is doing... I pushed these classes before but…
Jun 11, 2017
416c4e1
Update Iron Chest's to 1.12!
Jun 11, 2017
27a82a0
Use Java 8 and not Java 6!
Jun 11, 2017
b28ad34
Update all recipes from Iron Chests to the new way of doing them for …
Jun 17, 2017
8c0e03c
Update to CurseGradle 1.0.9!
Jun 19, 2017
1efea0c
Require Forge Version 14.21.0.2343 which fixes the crash regarding re…
Jun 21, 2017
69cedbf
Fix an issue regarding a change mapping name causing the build to fail.
Jun 21, 2017
7900ab3
Update Iron Chests to Forge 14.21.0.2359.
Jun 24, 2017
2825051
Fix crash related to loading TileEntitySpecialRenderer on server side…
Jun 28, 2017
9aecbfb
Clean up some code including how we register Blocks/Items, and fix is…
Jun 28, 2017
5aaf413
Remove a little mistake I made.
Jun 28, 2017
0468b6d
Update Iron Chests to 1.12.2.
Sep 28, 2017
90c0be1
Update zh_CN ironchest 1.12
Aemande123 Oct 5, 2017
9e198e1
Merge pull request #110 from Aemande123/1.12
Oct 6, 2017
0801bf8
Updated Russian translation
raspopov Nov 11, 2017
2e1612d
Merge pull request #112 from raspopov/patch-2
progwml6 Nov 15, 2017
5a9c3d7
Run DataFixer on the Chest's and Shulker Boxes, and fix the conflicti…
Feb 17, 2018
7d0770d
Added en_UD.lang
The-Fireplace Feb 18, 2018
df4fca5
Merge pull request #123 from The-Fireplace-Minecraft-Mods/1.12
Feb 18, 2018
a7735c1
Fix broken recipe
Feb 21, 2018
612cf23
Create ja_JP.lang (#128)
koh-gh Apr 10, 2018
5cdce17
Don't send the entire NBT tag to the client (#133)
josephcsible Apr 10, 2018
08cf8e0
Fix #131 (#132)
josephcsible Jun 17, 2018
81c12fe
Add a configuration option to allow the user to disable adding the cr…
Jun 17, 2018
ba7bb09
Updated Shulker Box colors (#125)
ZeroLevels Jul 30, 2018
06b0ccc
Fixed up some stray textures (#145)
ZeroLevels Jul 30, 2018
9d6a4e3
Update de_DE.lang (#149)
Vexatos Oct 2, 2018
443fe18
Added lv_LV.lang (#150)
LatvianModder Oct 3, 2018
c9c1c30
Check for valid metadata before looking up name. Closes #135
Oct 5, 2018
ba6bf68
Make sure the Shift never goes past the max value. Closes #130
Oct 5, 2018
d4fc242
Hopefully fix the disappearing issue with the chests. Closes #142
Oct 5, 2018
379f2e9
Fix crash related to inserting items with conduits/ducts. Closes #151
Oct 9, 2018
c93a667
Create uk locale
burunduk Nov 4, 2018
b0f79d1
Merge pull request #152 from burunduk/patch-1
progwml6 Nov 14, 2018
2db43e5
Fix registering TESR's while the class is null. Closes #156
Dec 20, 2018
e3130b3
Delete old source to start on 1.13
Dec 22, 2018
402bd8f
Begin updating Iron Chests to 1.13, Chests cannot be opened yet but a…
Jan 6, 2019
37b34bf
Format source code
Jan 6, 2019
49a0972
Fix up some issues with Build.gradle, Clean up code and switch to reg…
Jan 8, 2019
5eee1e2
Update to the latest forge, fix issues with the dirt chest book not f…
Jan 10, 2019
620a6b3
Update to the latest forge, Implement the packet to sync the topstack…
Jan 16, 2019
721d690
Fix broken import of an old event that CPW renamed in the latest vers…
Jan 16, 2019
a77f22e
Implement Recipes, Switch over to ObjectHolder and upgrade to the lat…
Jan 22, 2019
642cf07
Update IronChests to the latest Forge Version, and fix some code issues.
Feb 6, 2019
f5e8eb5
Implement GUIs for the chests, change the mod package to com.progwml6…
Feb 18, 2019
973ae4b
Update readme, Update to latest forge.
Feb 19, 2019
7ecd019
Fix broken links in readme.
Feb 19, 2019
d9b9654
Create zh_cn.json (#180)
XuyuEre Jun 11, 2019
2131067
Update Iron Chests to 1.14.2!
Jun 16, 2019
1d902fe
Create ko_kr.json (#185)
Laniv713 Jun 16, 2019
3757e81
Fix some formatting on the recipes.
Jun 16, 2019
ba182f6
convert lang to json (#188)
kotelkonrad Jul 20, 2019
55a7af2
Upgrade to 1.14.3!
Jul 20, 2019
f14408f
Fix chests dropping their contents when upgraded. Closes #197
Aug 19, 2019
b7bca1a
Update to 1.14.4 forge instead of 1.14.3
Aug 19, 2019
6e9f312
Update to the recommended build of forge!
Sep 12, 2019
b09f7f3
Fix the Vanilla chest upgrades trying to update 'I Like Wood' chests.…
Sep 26, 2019
94c6f7c
Begin work on Iron Chests for 1.15!
Dec 31, 2019
d015254
Begin work on Iron Chests for 1.15!
Dec 31, 2019
56db909
Upgrade Iron Chests to 1.15.2. Textures are broken at the moment due …
Jan 22, 2020
b49809c
Iron chests now work for 1.15!
Feb 28, 2020
14fe3e3
Fix a mistake created by intellij.
Feb 28, 2020
1e7ee30
Comment out the book until I can fix it.
Feb 28, 2020
04a307e
Hopefully fix the crash regarding loading the Atlas textures during m…
Mar 10, 2020
2f3d035
Create zh_tw.json
ForFunPenguin Mar 20, 2020
79b7489
Update zh_tw.json
ForFunPenguin Mar 22, 2020
55f6e9f
Merge pull request #213 from ForFunPenguin/patch-1
progwml6 Apr 10, 2020
906f42a
Update pl_pl.json
Waterrail Jul 21, 2020
6e35fbd
Merge pull request #220 from Waterrail/patch-1
progwml6 Jul 24, 2020
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
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!--- We do not take bug reports for outdated builds of Minecraft, or unofficial builds. -->

<!--- Provide a general summary of the issue in the Title above -->
## Version Information
`Minecraft: `
`Forge: `
`Iron Chests: `

## Report Information
<!-- Please provide a detailed description of the issue -->

## Steps to Reproduce
<!-- Please try to provide a way to reproduce the bug reported -->

## Crash Log
<!-- If you crash, please upload the crash log to gist.github.com or pastebin.com and provide a link here -->

## Forge Log
<!-- Upload the fml-client-latest.log to gist.github.com or pastebin.com and provide a link here -->

<!-- Thank you for reporting! -->
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
build/
.classpath
.project
/*.launch
.gradle/
eclipse/
bin/
repo/
out/
/run/
.settings/
#IDEA files from Gradle
.idea/
/*.iml
/*.ipr
/*.iws
/generated
31 changes: 31 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
pipeline {
agent any

stages {
stage('Checkout') {
steps {
checkout scm
sh "rm -rf build/libs"
}
}

stage('Build') {
steps {
sh "./gradlew build -PBUILD_NUMBER=${env.BUILD_NUMBER} --no-daemon"
}
}

stage('Archive') {
steps {
archive includes: 'build/libs/*.jar'
junit allowEmptyResults: true, testResults: 'build/test-results/**/*.xml'
}
}

stage('Deploy') {
steps {
sh "./gradlew publishMavenJavaPublicationToMavenRepository -PBUILD_NUMBER=${env.BUILD_NUMBER} -PDEPLOY_DIR=${env.MAVEN_DEPLOY_DIR} --no-daemon"
}
}
}
}
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

20 changes: 14 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
ironchest
=========
Iron Chests [![Curseforge](http://cf.way2muchnoise.eu/full_iron-chests_downloads.svg)](https://minecraft.curseforge.com/projects/iron-chests) [![Curseforge](http://cf.way2muchnoise.eu/versions/For%20MC_iron-chests_all.svg)](https://minecraft.curseforge.com/projects/iron-chests)
===========

Iron Chest minecraft mod
Iron Chests! A mod that adds new chests.

a GPL v3 licensed mod by cpw
Please note that the Shulker Boxes in 1.13+ have been moved to their own mod: [Iron Shulker Boxes](https://minecraft.curseforge.com/projects/iron-shulker-boxes)

Currently Maintained by ProgWML6
For issues with the Shulker Boxes starting in 1.13+, Please report them to [Iron Shulker Boxes](https://github.com/progwml6/ironshulkerboxes)

See http://files.minecraftforge.net/IronChests2/ for downloads
## Setting up a Workspace/Compiling from Source
Note: Git MUST be installed and in the system path to use our scripts.
* Setup: Run [gradle]in the repository root: `gradlew[.bat] [eclipse] OR import build.gradle into idea`
* Build: Run [gradle]in the repository root: `gradlew[.bat] build`
* If obscure Gradle issues are found try running `gradlew clean` and `gradlew cleanCache`

[![Discord](https://img.shields.io/discord/102860784329052160.svg?style=for-the-badge)](https://discord.gg/njGrvuh)

If you have queries about any license or the other restrictions, please drop by our IRC channel, #progsmods on irc.esper.net
250 changes: 125 additions & 125 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,159 +1,159 @@
// This sets us up for building a forge project - you need all of these
buildscript {
repositories {
mavenLocal()
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
mavenCentral()
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle.forge'

apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'maven-publish'

// This is a simple flatdir repository for "uploadArchives" when you don't have a remote repo to target
repositories {
flatDir {
name "fileRepo"
dirs "repo"
maven {
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'
}
}
// IronChest uses git tagging to mark major versions. This sets up the project version to that version data
def versionInfo = getGitVersion()
version = "${versionInfo['IronChest.version']}"

// This is our group. I'm cpw.mods
group= "cpw.mods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
// This is our actual project within the group. Note: FML has "fml" here. But this is ironchest.
archivesBaseName = "ironchest"
group = "com.progwml6.ironchest"

sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'

// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
minecraft {
version = "1.8.9-11.15.0.1689"
mappings = "stable_20"
runDir = "run"
}
mappings channel: 'snapshot', version: mappings_version

// This wrangles the resources for the jar files- stuff like textures and languages
processResources
{
// we're omitting the .xcf files - they're development only
exclude '**/*.xcf'
// we only want to do search/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
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

// generate version.properties file from the git version data earlier
doLast {
def propsFile = new File(destinationDir, 'version.properties')
def properties = new Properties()
properties.putAll(versionInfo)
properties['IronChest.build.mcversion'] = project.minecraft.version
properties.store(propsFile.newWriter(), null)
}
}
runs {
client {
workingDirectory project.file('run')

// Configure an upload task. this is setup for uploading to files.minecraftforge.net. There are other examples around
uploadArchives {
repositories.mavenDeployer {
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE'

dependsOn 'build'
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

if (project.hasProperty('forgeMavenPassword'))
{
repository(url: "http://files.minecraftforge.net/maven/manage/upload") {
authentication(userName: project.getProperty('forgeMavenUser'), password: project.getProperty('forgeMavenPassword')) // the elvis operator. look it up.
mods {
ironchest {
source sourceSets.main
}
}
}
else
{
// local repo folder. Might wanna juset use gradle install if you wanans end it to maven-local
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
}
// This is just the pom data for the maven repo
pom {
groupId = project.group
// Force the maven upload to use the <mcversion>-<version> syntax preferred at files
version = "${project.minecraft.version}-${project.version}"
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'IronChest'
url 'https://github.com/progwml6/IronChest'

scm {
url 'https://github.com/progwml6/IronChest'
connection 'scm:git:git://github.com/progwml6/IronChest.git'
developerConnection 'scm:git:git@github.com:progwml6/IronChest.git'
}

issueManagement {
system 'github'
url 'https://github.com/progwml6/IronChest/issues'
}
server {
workingDirectory project.file('run')

licenses {
license {
name 'GNU Public License (GPL), Version 3.0'
url 'http://www.gnu.org/licenses/gpl-3.0.txt'
distribution 'repo'
}
// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE'

// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

mods {
ironchest {
source sourceSets.main
}
}
}

data {
workingDirectory project.file('run')

// Recommended logging data for a userdev environment
property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE'

developers {
developer {
id 'cpw'
name 'cpw'
roles { role 'developer' }
}
// Recommended logging level for the console
property 'forge.logging.console.level', 'debug'

args '--mod', 'ironchest', '--all', '--output', file('generated/resources/')

mods {
ironchest {
source sourceSets.main
}
}
}
}
}

// This is a special task for pulling the version information from git and the environment (for BUILD_NUMBER)
def getGitVersion()
{
def out = [:]

// call git command.
def outStream = new ByteArrayOutputStream()
def result = exec {
executable = 'git'
args = [ 'describe', '--long', "--match=[^(jenkins)]*"]
standardOutput = outStream
}

def fullVersion = outStream.toString().trim()
def matcher = fullVersion =~ /(\d+).(\d+)-(\d+)-(.*)/

def maj = matcher[0][1]
def min = matcher[0][2]
def rev = matcher[0][3]
def bn = System.getenv("PROMOTED_NUMBER") ?: System.getenv("BUILD_NUMBER") ?: "1"

out['IronChest.build.major.number'] = maj.toString()
out['IronChest.build.minor.number'] = min.toString()
out['IronChest.build.revision.number'] = rev.toString()
out['IronChest.build.githash'] = matcher[0][4].toString()
out['IronChest.build.number' ] = bn.toString()
out['IronChest.version' ] = "${maj}.${min}.${rev}.${bn}".toString()

return out
dependencies {
minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version
}

task buildInfo {
def cmd = "git rev-parse --short HEAD"
def proc = cmd.execute()
proc.waitFor()
if (proc.exitValue() == 0) {
ext.revision = proc.text.trim()
} else {
ext.revision = "GITBORK"
}

if (System.getenv().BUILD_NUMBER != null) {
ext.buildNum = System.getenv().BUILD_NUMBER
} else {
ext.buildNum = "DEV.${project.buildInfo.revision}"
}
}

version = "${minecraft_version}-${mod_version}.${project.buildInfo.buildNum}"

processResources {
exclude '**/*.xcf'
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'

expand 'version': project.version, 'mcversion': minecraft_version, 'forge_version': forge_version_toml
}

from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}

task sourcesJar(type: Jar) {
from sourceSets.main.allJava
classifier = 'sources'
}

artifacts {
archives sourcesJar
}

jar {
manifest {
attributes([
"Specification-Title" : "Iron Chests",
"Specification-Vendor" : "Progwml6",
"Specification-Version" : "1", // We are version 1 of ourselves
"Implementation-Title" : project.name,
"Implementation-Version" : "${version}",
"Implementation-Vendor" : "Progwml6",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}

publishing {
publications {
mavenJava(MavenPublication) {
artifact jar
artifact sourcesJar
}
}

repositories {
if (project.hasProperty('DEPLOY_DIR')) {
maven { url DEPLOY_DIR }
}
}
}
Loading