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

PSA: Inactive repository. Please check Kobata's fork instead! #317

Open
wants to merge 33 commits into
base: nomcp
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4ed25ab
Deobfuscate sources & Refactor them for MCP
Nov 20, 2012
656eac7
Update launcher scripts, Localization resources fix when launched thr…
Nov 20, 2012
aa38f5f
Update sources to MCP 7.22
Nov 20, 2012
0dce76e
Added compatibility for Backpacks and Red Power 2 Canvas Bags
Dec 28, 2012
8a131c8
Merge pull request #300 from Eydamos/develop_mcp
Jan 5, 2013
2b86083
Merge branch 'develop_mcp' of https://github.com/mkalam-alami/invento…
mkalam-alami Jan 5, 2013
1672f21
Implemented even stacks (distribute items) for crafting tables.
Dec 23, 2012
3e4f472
improved even stacks (optimized, removed magic numbers for 2x2 crafti…
Dec 25, 2012
4b191af
fix even stacks to skip items with more than max number of items (not…
Dec 25, 2012
82d1a58
Merge fixes
Kobata Dec 25, 2012
093fb40
Ignore first mouse event after opening a GUI. Fixes #2.
Kobata Dec 28, 2012
5426966
Fix RP2 project table slot numbers.
Kobata Jan 1, 2013
f52f758
Run crafting even-stacks on chests if they have a CRAFTING_IN section.
Kobata Jan 1, 2013
37ab847
Thaumcraft 3: Mark crafting slots on Arcane & Infusion Workbenches as…
Kobata Jan 2, 2013
ea8d295
Insure 'valid chests' are always instances of GuiContainer.
Kobata Jan 5, 2013
3845c4c
Add handling for armor replacement when a non-armor item (e.g. skulls…
Kobata Jan 5, 2013
b700a4d
Fix #299: Cherry-pick @iluvredwall implementation of stacks evening
mkalam-alami Jan 6, 2013
970c3b8
Merge
mkalam-alami Jan 6, 2013
0b99e8c
Transition to MCP build process
Jan 7, 2013
9514c41
Packaging script
mkalam-alami Jan 16, 2013
0d47294
Add a screen to help NoCheatPlus victims
mkalam-alami Jan 16, 2013
ecfb004
Middle-click fix
mkalam-alami Jan 16, 2013
4f65108
Versioning info update
mkalam-alami Jan 16, 2013
6a4384a
Integrate package mod scripts
mkalam-alami Jan 16, 2013
e544354
MCP-transition bugfixes
mkalam-alami Jan 16, 2013
e800679
Readme update
mkalam-alami Jan 16, 2013
4bde99e
Rename doc files
mkalam-alami Jan 16, 2013
ab57dcf
Remove click delay option, fix open chests
mkalam-alami Jan 16, 2013
74670bd
Update changelog / dl link
mkalam-alami Jan 16, 2013
d16950e
Document new shortcut
mkalam-alami Jan 16, 2013
0439411
Add link to Kobata's fork in README.md
Fostenel Mar 9, 2013
8733039
Fix formatting
Fostenel Mar 10, 2013
ae4b65b
Complete redirection to Kobata's fork
Mar 10, 2013
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
41 changes: 33 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,44 @@
# Filter Minecraft sources
/src/minecraft/*
!/src/minecraft/invtweaks
!/src/minecraft/net
/src/minecraft/net/minecraft/client
/src/minecraft/net/minecraft/server
/src/minecraft/net/minecraft/src/*
!/src/minecraft/net/minecraft/src/InvTweaks*

# Builds & binaries
bin/
target/
lib/
client/
isom/
InvTweaks-*/
files/
invtweaks_docs/_build
launcher/
docs/_build
*.zip
*.jar
minecraft/net/minecraft/src/*.java
*#

# Tmp files
*~
*.rej
*#

# IDEs
.classpath
.project
.settings
.pydevproject

# MCP Files
docs/
conf/
eclipse/
jars/
logs/
runtime/
temp/
reobf/
CHANGELOG
LICENSE.txt
*.bat
*.sh

# Misc
*.rej
2 changes: 1 addition & 1 deletion LICENSE.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Inventory Tweaks Mod license (MIT)

Copyright (c) 2011-2012 Marwane Kalam-Alami
Copyright (c) 2011-2013 Marwane Kalam-Alami

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<img src="http://modding.kalam-alami.net/site/img/invtweaks.png" />
## This repository is not maintained anymore.

* Matching Minecraft version: **1.4.4**
**Kobata has a well maintained fork with multiple bugfixes and additions. Since March 2013, he is the new official maintainer for InvTweaks.**

## What's this project about
* **Please go to [his fork of this repository](https://github.com/Kobata/inventory-tweaks) for further updates**
* **See also the new [InvTweaks thread](http://www.minecraftforum.net/topic/1720872-inventory-tweaks-151-mar-9/) on the Minecraft forums**

This Open Source project (see [License](https://github.com/mkalam-alami/inventory-tweaks/blob/master/src/doc/license.txt)) is a client mod for [Minecraft](http://www.minecraft.net/), a game by [Mojang AB](http://mojang.com/). It implements various features to help players with the management of inventories and chests. A lot of effort has been put to make it as customizable as possible, without being annoying to set up.
## What is Inventory Tweaks?

## Get started
This Open Source project (see [License](https://github.com/mkalam-alami/inventory-tweaks/blob/master/src/doc/license.txt)) is a client mod for [Minecraft](http://www.minecraft.net/), a game by [Mojang AB](http://mojang.com/). It implements various features to help players with the management of inventories and chests. A lot of effort has been put to make it as customizable as possible, without being annoying to set up.

* For documentation about how to use or install the mod, see the [main page of Inventory Tweaks](http://wan.ka.free.fr/?invtweaks). This place is for developers!
* To start coding, all is explained on the [project's wiki](https://github.com/mkalam-alami/inventory-tweaks/wiki).
<img src="http://inventory-tweaks.readthedocs.org/en/latest/_images/invtweaks.png" />
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</delete>
<echo> - Copying zip to mods folder</echo>
<copy todir="${modsDir}">
<fileset dir="target/" includes="InvTweaks*.zip" />
<fileset dir="." includes="InvTweaks-DEV.zip" />
</copy>
<echo> - Done!</echo>
</target>
Expand Down
155 changes: 155 additions & 0 deletions conf/mcp.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
[DEFAULT]
DirTemp = temp
DirSrc = src
DirLogs = logs
DirBin = bin
DirJars = jars
DirReobf = reobf
DirConf = conf
DirRuntime = runtime
DirLib = lib
DirTempSrc = temp/src
DirTempCls = temp/cls
DirTempBin = temp/bin
DirModSrc = modsrc
DirEclipse = eclipse

[CSV]
Classes = %(DirConf)s/classes.csv
Methods = %(DirConf)s/methods.csv
Fields = %(DirConf)s/fields.csv
Params = %(DirConf)s/params.csv
NewIds = %(DirConf)s/newids.csv

[SRGS]
ConfClient = %(DirConf)s/client.srg
ConfServer = %(DirConf)s/server.srg
Client = %(DirTemp)s/client_rg.srg
Server = %(DirTemp)s/server_rg.srg
DeobfClient = %(DirTemp)s/client_deobf.srg
DeobfServer = %(DirTemp)s/server_deobf.srg
ReobfClient = %(DirTemp)s/client_ro.srg
ReobfServer = %(DirTemp)s/server_ro.srg

[JAR]
DirNatives = %(DirJars)s/bin/natives
Client = %(DirJars)s/bin/minecraft.jar
Server = %(DirJars)s/minecraft_server.jar
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
MD5Client = 48677dc4c2b98c29918722b5ab27b4fd
MD5Server = b0700fa969dbf0ff085082cde87384d2

[RETROGUARD]
Location = %(DirRuntime)s/bin/retroguard.jar
RetroConf = %(DirTemp)s/retroguard.cfg
RetroReobConf = %(DirTemp)s/retroguard_ro.cfg
ClientConf = %(DirTemp)s/client_rg.cfg
ServerConf = %(DirTemp)s/server_rg.cfg
ClientReobConf = %(DirTemp)s/client_ro.cfg
ServerReobConf = %(DirTemp)s/server_ro.cfg
ClientOut = %(DirTemp)s/minecraft_rg.jar
ServerOut = %(DirTemp)s/minecraft_server_rg.jar
ClientLog = %(DirLogs)s/client_rg.log
ServerLog = %(DirLogs)s/server_rg.log
ClientDeobLog = %(DirLogs)s/client_deob.log
ServerDeobLog = %(DirLogs)s/server_deob.log
NullPkg = net/minecraft/src

[EXCEPTOR]
XClientCfg = %(DirConf)s/joined.exc
XServerCfg = %(DirConf)s/joined.exc
XClientOut = %(DirTemp)s/minecraft_exc.jar
XServerOut = %(DirTemp)s/minecraft_server_exc.jar
XClientLog = %(DirLogs)s/client_exc.log
XServerLog = %(DirLogs)s/server_exc.log

[DECOMPILE]
ClsClientTemp = %(DirTempCls)s/minecraft
ClsServerTemp = %(DirTempCls)s/minecraft_server
SrcClientTemp = %(DirTempSrc)s/minecraft
SrcServerTemp = %(DirTempSrc)s/minecraft_server
FFSource = net

[OUTPUT]
BinClientTemp = %(DirTempBin)s/minecraft
BinServerTemp = %(DirTempBin)s/minecraft_server
SrcClient = %(DirSrc)s/minecraft
SrcServer = %(DirSrc)s/minecraft_server
TestClient = net/minecraft/client/Minecraft
TestServer = net/minecraft/server/MinecraftServer

[PATCHES]
PatchClient = %(DirConf)s/patches/minecraft.patch
PatchServer = %(DirConf)s/patches/minecraft_server.patch
PatchTemp = %(DirTemp)s/temp.patch
FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch

[RECOMPILE]
BinClient = %(DirBin)s/minecraft
BinServer = %(DirBin)s/minecraft_server
LogClient = %(DirLogs)s/client_compile.log
LogServer = %(DirLogs)s/server_compile.log
ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
ClientFixes = %(DirConf)s/patches
FixStart = Start
IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml

[REOBF]
MD5Client = %(DirTemp)s/client.md5
MD5Server = %(DirTemp)s/server.md5
MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
RecompJarClient = %(DirTemp)s/client_recomp.jar
RecompJarServer = %(DirTemp)s/server_recomp.jar
ObfJarClient = %(DirTemp)s/client_reobf.jar
ObfJarServer = %(DirTemp)s/server_reobf.jar
ReobfDirClient = %(DirReobf)s/minecraft
ReobfDirServer = %(DirReobf)s/minecraft_server
ClientRoLog = %(DirLogs)s/client_ro.log
ServerRoLog = %(DirLogs)s/server_ro.log
ReobfClientLog = %(DirLogs)s/client_reob.log
ReobfServerLog = %(DirLogs)s/server_reob.log

[GETMODSOURCE]
OutSRCClient = %(DirModSrc)s/minecraft
OutSRCServer = %(DirModSrc)s/minecraft_server

[MCP]
LogFile = %(DirLogs)s/mcp.log
LogFileErr = %(DirLogs)s/mcperr.log
UpdateUrl = http://mcp.ocean-labs.de/files/mcprolling_{version}/
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
RGIndex = 92000
ParamIndex = 8000

[ASTYLE]
AstyleConfig = %(DirConf)s/astyle.cfg

[COMMANDS]
Wine = wine
Patcher_win = %(DirRuntime)s/bin/applydiff.exe
Patcher_linux = patch
Patcher_osx = patch
Jad_win = %(DirRuntime)s/bin/jad.exe
Jad_osx = %(DirRuntime)s/bin/jad-osx
AStyle_win = %(DirRuntime)s/bin/astyle.exe
AStyle_linux = astyle
AStyle_osx = %(DirRuntime)s/bin/astyle-osx
JadRetro = %(DirRuntime)s/bin/jadretro.jar
Fernflower = %(DirRuntime)s/bin/fernflower.jar
Exceptor = %(DirRuntime)s/bin/mcinjector.jar
CmdPatch = %s -p1 -u -i {patchfile} -d {srcdir}
CmdJad = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
CmdAStyle = %s --suffix=none --quiet --options={conffile} {classes}
CmdRG = %s -cp "{classpath}" RetroGuard -searge {conffile}
CmdRGReobf = %s -cp "{classpath}" RetroGuard -notch {conffile}
CmdJadretro = %s -jar %s {targetdir}
CmdFernflower = %s -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir} {outdir}
CmdExceptor = %s -jar %s {input} {output} {conf} {log}
CmdRecomp = %s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
CmdStartClt = %s -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
14 changes: 0 additions & 14 deletions docs/download.txt

This file was deleted.

Loading