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

Removed email address. #551

Open
wants to merge 330 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
330 commits
Select commit Hold shift + click to select a range
9d9af32
Allow stone double slabs with meta up to 15 instead of 7.
Lunatrius Aug 19, 2014
9f668ff
Increased the message count for SBCs to 20 and added debug output.
Lunatrius Aug 19, 2014
5f273ae
Extracted block placement code and added some error logging. Fixes #46
Lunatrius Aug 26, 2014
f31baac
Re-enabled alpha support. This time around it uses a really simple sh…
Lunatrius Aug 27, 2014
613869d
Bumped version number.
Lunatrius Aug 27, 2014
8e0762b
Fixed the printer crashing other mods. Yay deprecated code! Fixes #47
Lunatrius Aug 28, 2014
a7aeea9
Moved a few methods into SchematicUtil.
Lunatrius Aug 28, 2014
e8f3a73
Replaced Enable/Disable with OFF/ON.
Lunatrius Sep 4, 2014
504c66b
Refactored all constant strings into the Names class.
Lunatrius Sep 4, 2014
d622164
Updated localization files.
Lunatrius Sep 4, 2014
47cf3ba
Do not print if a block is missing a mapping.
Lunatrius Sep 6, 2014
847ff2a
Tweaks to gradle.
Lunatrius Sep 17, 2014
69c1fd2
Make sure to reobf the universal jar...
Lunatrius Sep 17, 2014
8e21f5b
Do not use a full path as the default location for schematics. Closes…
Lunatrius Sep 17, 2014
e17ec7d
The setup gradle section is not needed, contributors/developers shoul…
Lunatrius Sep 27, 2014
3b45e8c
Converted all tabs to spaces.
Lunatrius Sep 27, 2014
5c71d74
Added formatting changes to README.md
Lunatrius Sep 27, 2014
bfadc98
Fixed issues with mods that access blockType via the field instead of…
Lunatrius Oct 5, 2014
414220e
Added simple tootips for schematics.
Lunatrius Oct 24, 2014
9faf473
Updated localizations.
Lunatrius Oct 24, 2014
470ad00
Bumped version.
Lunatrius Oct 24, 2014
86a1a43
Fixed a NPE with the rayTrace method.
Lunatrius Oct 31, 2014
0eeade6
Just use the KeyBinding key code instead of manually poking into LWJG…
Lunatrius Nov 2, 2014
cfcd79a
Added curse upload tasks.
Lunatrius Nov 17, 2014
6f95f33
Added server side features.
Lunatrius Nov 19, 2014
adc01da
Updated localizations.
Lunatrius Nov 19, 2014
237a9f3
Added instance variables for all event handlers.
Lunatrius Nov 20, 2014
02d72c0
Use the type parameter of Comparator...
Lunatrius Nov 20, 2014
b1f7285
Set the position before the sort instead of every call to compare.
Lunatrius Nov 20, 2014
91a77cc
Set position not schematic...
Lunatrius Nov 20, 2014
5572e8f
Schematic saving chunk by chunk
AtomicBlom Nov 20, 2014
5b81093
Schematic saving chunk by chunk
AtomicBlom Nov 20, 2014
77c6625
Merge pull request #55 from AtomicBlom/chunk-by-chunk
Lunatrius Nov 20, 2014
a074243
Bare bones of the server side schematic creation.
Lunatrius Nov 20, 2014
1c77d94
Replaced client side only chunk provider and save handler with noop i…
Lunatrius Nov 21, 2014
800c295
A simple read/write implementation for the schematic chunk messages.
Lunatrius Nov 21, 2014
bc90131
Command to save schematic on server - /schematicaSave
AtomicBlom Nov 24, 2014
9aebe03
Merge pull request #56 from AtomicBlom/save-command
Lunatrius Nov 24, 2014
76c33dc
Fixed the config property descriptions.
Lunatrius Nov 24, 2014
d9a1e40
Added @AtomicBlom to the credits/contributors.
Lunatrius Nov 24, 2014
af2aa76
Removed the canCommandSenderUseCommand override to actually make use …
Lunatrius Nov 24, 2014
6f4c68b
Localization update.
Lunatrius Nov 24, 2014
2100bdf
Made the mod optional on both sides.
Lunatrius Nov 25, 2014
f1e9ebe
Updated the core.
Lunatrius Nov 25, 2014
b24ea77
Set blocks individually instead of setting them in bulk.
Lunatrius Nov 25, 2014
aece62d
Extracted chunk-wise code in preparation for scheduled/delayed schema…
Lunatrius Nov 25, 2014
255688b
Simplified the proxy classes.
Lunatrius Nov 26, 2014
9459fd4
Added queued schematic saving.
Lunatrius Nov 26, 2014
5b7314b
List and Remove commands for quota management.
AtomicBlom Nov 29, 2014
96fd782
Merge pull request #59 from AtomicBlom/quotas
Lunatrius Nov 29, 2014
10d9af0
Fixed odd schematic behavior when the player is on huge +/- XZ coordi…
Lunatrius Dec 1, 2014
d61a7bb
Include the chunks on the higher X coordinate. Fixes #61
Lunatrius Dec 3, 2014
7d511e9
Temporary fix for saving schematics on servers.
Lunatrius Dec 5, 2014
fd56896
Correctly handle all rotated pillar blocks (haybales, logs).
Lunatrius Dec 8, 2014
8740ba2
Add the schematic icon to the starting message.
Lunatrius Dec 12, 2014
81d4bab
Extracted chunk dimension constants into a separate class.
Lunatrius Dec 13, 2014
9847df8
Rename the schematic transfer classes.
Lunatrius Dec 13, 2014
0bb3e44
ko_KR.lang
qb20nh Dec 22, 2014
0f38609
ko_KR.lang
qb20nh Dec 23, 2014
7430390
Merge pull request #63 from hieroglyphic/patch-1
Lunatrius Dec 25, 2014
958406a
Added server side schematicaDownload command.
Lunatrius Dec 26, 2014
d8a0b4c
Localization update.
Lunatrius Dec 26, 2014
d1ccde8
Added a message to notify the player about a finished download.
Lunatrius Dec 27, 2014
90b7044
Added a base command for easier permission management.
Lunatrius Dec 27, 2014
5763697
Extracted file utility classes into it's own class.
Lunatrius Dec 27, 2014
ae8870f
Make use of the new curse property additionalArtifact.
Lunatrius Dec 27, 2014
04fac35
Replaced all buttons for position/layer control with a single numeric…
Lunatrius Jan 7, 2015
12c4f65
The material list is now compiled from the whole schematic or a speci…
Lunatrius Jan 7, 2015
ac0a331
Fixed NPE, closes #67
Lunatrius Jan 10, 2015
ab0f677
Added the option to add extra air blocks for the rendering part.
Lunatrius Jan 10, 2015
6cc8a58
Consistency stuff.
Lunatrius Jan 10, 2015
1aba3b3
API for hooking into the Schematic Saving process.
AtomicBlom Jan 13, 2015
d2be0c8
Merge pull request #69 from AtomicBlom/api
Lunatrius Jan 13, 2015
36f9fe7
Moved the nibble array construction bellow the tile entity serializat…
Lunatrius Jan 13, 2015
225b193
Added the ISchematic implementation.
Lunatrius Jan 13, 2015
bc2a28a
Exposed the schematic field in PostSchematicCaptureEvent and removed …
Lunatrius Jan 13, 2015
0a59d76
Slight change to the API.
Lunatrius Jan 13, 2015
f29da79
Set the correct API owner.
Lunatrius Jan 13, 2015
a407600
|| != &&
Lunatrius Jan 13, 2015
e0ad007
Make use of the new API.
Lunatrius Jan 13, 2015
77b44c9
Add the apiJar task to the signJars and curse tasks.
Lunatrius Jan 13, 2015
d19f744
Make sure to include the API in the main jar as well.
Lunatrius Jan 14, 2015
f59e8a0
Updated the de_DE language file
Jan 14, 2015
affb7f8
Added unbound keys for next/previous layer.
Lunatrius Jan 15, 2015
2d7dae0
Renamed the input event handler and simplified keybinding handling.
Lunatrius Jan 15, 2015
2f63b10
Handle all input events in a single handler.
Lunatrius Jan 15, 2015
7e27bd0
Merge pull request #70 from manuelgu/patch-1
Lunatrius Jan 15, 2015
d4c6393
Uncommented translated strings in de_DE.lang.
Lunatrius Jan 15, 2015
a61f261
Removed untranslated strings. It just adds unnecessary noise and clut…
Lunatrius Jan 15, 2015
79f8e51
Gradle tweaks.
Lunatrius Jan 15, 2015
4e95ac7
Fixed the tooltip ignoring the config value.
Lunatrius Jan 19, 2015
c90c489
Removed debug code...
Lunatrius Jan 22, 2015
44672b1
Fixed non vanilla air blocks from being added to the material list.
Lunatrius Feb 1, 2015
41ca7ac
Use the world method instead...
Lunatrius Feb 1, 2015
0c6f104
Update to 1.8. A lot of things don't work (yet).
Lunatrius Feb 2, 2015
9253bb5
Fixed tile entities not rendering.
Lunatrius Feb 2, 2015
3985bc3
Made swap slots easier to configure.
Lunatrius Feb 3, 2015
649ac9e
Removed the entity count as it's always 0/0.
Lunatrius Feb 5, 2015
5cbef2f
Added blue/red point rendering.
Lunatrius Feb 5, 2015
60f4e73
Prevent pick block from picking when not rendering and/or when a real…
Lunatrius Feb 5, 2015
2de2a26
Made all chunks render when inside the schematics bounds.
Lunatrius Feb 11, 2015
2d5642e
Make the chunk rendering less derpy.
Lunatrius Feb 11, 2015
d27e9c2
Added a separate render distance slider for schematics.
Lunatrius Feb 13, 2015
afe0335
Requires a restart to work.
Lunatrius Feb 13, 2015
a6fd670
Replaced the old logo with the new logo made by razarosu (MCF).
Lunatrius Feb 13, 2015
9ac2de5
Added license file for contributed resources.
Lunatrius Feb 14, 2015
fcefaf6
Fixed commands on servers...
Lunatrius Feb 14, 2015
275d483
Move DEFAULT_ICON to the SchematicUtil class to make it available on …
Lunatrius Feb 14, 2015
d40fae4
Fix transfer for schematic files with dimensions that are a multiple …
Lunatrius Feb 14, 2015
fab32cc
Missed a few.
Lunatrius Feb 14, 2015
065b16d
Added entity related methods to the API.
Lunatrius Feb 15, 2015
4d9d812
Missed some formatting...
Lunatrius Feb 15, 2015
8b559b8
Fixed schematics with invalid metadata not loading.
Lunatrius Feb 16, 2015
b3cc793
Updated the year in the LICENSE file.
Lunatrius Feb 22, 2015
ee04fff
Moved the geometry tesselator into LunatriusCore.
Lunatrius Feb 22, 2015
5d42343
Removed a useless constructor.
Lunatrius Feb 22, 2015
ec85681
Fixed the schematicaList command failing for users whose schematic fo…
Lunatrius Feb 23, 2015
2d67929
Added back overlay rendering.
Lunatrius Feb 24, 2015
05122cd
Removed no longer used config settings.
Lunatrius Feb 24, 2015
2c33e30
Fix for latest LunatriusCore.
Lunatrius Feb 25, 2015
af23274
Minor optimization and a fix for IllegalArgumentException in postRend…
Lunatrius Feb 26, 2015
cfc5595
Replace the quad construction loop by explicit calls (for speed) and …
Lunatrius Feb 26, 2015
38f2ba5
Only need a single BlockPos instance for both calls...
Lunatrius Feb 26, 2015
e48d1ce
Removed unused methods/variables and an identical overridden method.
Lunatrius Feb 26, 2015
0590608
Fixed tile entities (sometimes) not rendering due to wrong view point…
Lunatrius Feb 26, 2015
dcd84ee
Chunks outside the schematic are no longer compiled (for the overlay).
Lunatrius Feb 26, 2015
0c92728
Register the schematic dispatcher to the resource manager. Fixes #78
Lunatrius Feb 27, 2015
3662168
Prevent chunks outside the schematic to rebuild, just return a blank,…
Lunatrius Feb 27, 2015
ecea9f8
Re-implemented schematic rotation and extended it to all 6 directions.
Lunatrius Mar 7, 2015
3b233b2
Do not refresh the schematic if the rotation failed.
Lunatrius Mar 7, 2015
c9dc1d6
Fixed a crash in non-dev environment.
Lunatrius Mar 7, 2015
f9d18b9
Added support for logs, pillars, pillar quartz blocks and levers.
Lunatrius Mar 9, 2015
ad93218
Updated gradle wrapper, merged gradle scripts and split a part of the…
Lunatrius Mar 9, 2015
fced1bf
Do not reset client settings when connecting to a server.
Lunatrius Mar 11, 2015
29346b5
Tweaked logging messages and log levels.
Lunatrius Mar 11, 2015
7851d77
Use the FileUtils from the core.
Lunatrius Mar 11, 2015
6efdf57
Fixed the printer being disabled on the first world load.
Lunatrius Mar 12, 2015
a735c21
Moved the block list creation to a separate class.
Lunatrius Mar 13, 2015
cd48b15
Moved classes into appropriate packages.
Lunatrius Mar 15, 2015
ff34f79
Missed one class.
Lunatrius Mar 15, 2015
db0c1b8
Fixed a NPE/race condition.
Lunatrius Mar 19, 2015
ae36490
Added extra key bindings (unbound by default).
Lunatrius Mar 23, 2015
b852f18
Overhauled the printer (should support more blocks by default).
Lunatrius Mar 24, 2015
064972b
Replaced the SchematicaMapping tag with a more standard Mapping tag (…
Lunatrius Mar 25, 2015
2444b13
Revert "Replaced the SchematicaMapping tag with a more standard Mappi…
Lunatrius Mar 26, 2015
dcdbfb0
Fixed the printer not placing blocks for some users.
Lunatrius Mar 27, 2015
5db2958
Added cocoa beans to the placement registry.
Lunatrius Mar 27, 2015
f2307b2
Do not render tile entities if the block is not an air block.
Lunatrius Mar 27, 2015
e1fab45
Added banners to the ignore list.
Lunatrius Mar 27, 2015
1a7fe45
Do not pass MBlockPos directly into the place method, it can freeze t…
Lunatrius Apr 12, 2015
1855377
Removed explicit conversion to BlockPos (passed in argument is alread…
Lunatrius Apr 19, 2015
57fbd04
Fixed schematic blocks sometimes rendering even though they should no…
Lunatrius Apr 19, 2015
926e5d2
Simplified slot swapping.
Lunatrius May 9, 2015
18be425
Added the schematic instance/context to PreSchematicSaveEvent.
Lunatrius May 15, 2015
a0fcc6a
Replaced the coordinate loops with an YXZ iterator.
Lunatrius May 25, 2015
e567d20
Reverted the build mode back to layers instead of columns, corrected …
Lunatrius May 25, 2015
9320144
Actually corrected the schematic bounds for the printer...
Lunatrius May 25, 2015
9567e81
Added material list sorting and dumping.
Lunatrius May 26, 2015
74efeb1
Write the list to the dumps folder.
Lunatrius May 26, 2015
1545050
Finished up the material list sorting.
Lunatrius May 27, 2015
44df79b
Fixed a typo in RotationHelper and added a missing valid value checks.
Lunatrius May 30, 2015
51cd962
Added really *simple* double slab placing.
Lunatrius Jun 4, 2015
fd943b8
Bumped micro version, because.
Lunatrius Jun 4, 2015
4586c26
Move entity and tile entity read/write methods to NBTHelper.
Lunatrius Jun 29, 2015
4bddb6e
Cleaned up the configuration handler.
Lunatrius Jul 1, 2015
60e3938
Fixed the bounding box for loaded schematics.
Lunatrius Jul 1, 2015
8703c6d
Added schematic block information to the debug overlay.
Lunatrius Jul 1, 2015
ba40950
Removed old tooltip code.
Lunatrius Jul 1, 2015
d602302
Replaced direct GL calls with the state manager.
Lunatrius Jul 1, 2015
3450146
Resynced assets.
Lunatrius Jul 1, 2015
10f5109
Updated Forge.
Lunatrius Jul 30, 2015
8ef4e5c
Fixed the schematic not updating after changing dimensions.
Lunatrius Jul 30, 2015
6801867
Removed ATs that are no longer used.
Lunatrius Jul 31, 2015
618d2fa
Only add the world access if a schematic is loaded.
Lunatrius Jul 31, 2015
58807df
Improved air block checking.
Lunatrius Aug 3, 2015
e6c0d48
Fixed a client lockup bug with large schematics.
Lunatrius Aug 9, 2015
04b5ff5
IWorldAccess can be safely added/removed only on block load/unload (w…
Lunatrius Aug 10, 2015
aed3b6b
Removed the condition, will not work on first world load otherwise...
Lunatrius Aug 18, 2015
bf4f377
Added current progress to the material list.
Lunatrius Aug 18, 2015
65fdabb
Re-added flipping support.
Lunatrius Aug 18, 2015
2573ad2
Added simple NBT sync handlers for command blocks and signs.
Lunatrius Sep 10, 2015
c24c206
Added missing map clear.
Lunatrius Sep 10, 2015
9c9ca94
Enabled NBT sync for command blocks and signs.
Lunatrius Sep 10, 2015
bfba344
Moved BlockStateHelper to the correct package.
Lunatrius Oct 26, 2015
bcb5c6e
Extracted state comparison into a helper method.
Lunatrius Oct 26, 2015
f0068d7
Added a block replacement command.
Lunatrius Oct 26, 2015
4cf093e
Fixed schematic blocks not rendering inside the extra air blocks.
Lunatrius Oct 30, 2015
c32b727
Change the timeout to a simple decrement like it was supposed to be...
Lunatrius Nov 3, 2015
414782a
Stop the printer when the game is paused.
Lunatrius Nov 3, 2015
404a4f7
Add config option for the printer range.
Lunatrius Nov 3, 2015
a8bf960
Fix weird config behavior for list properties.
Lunatrius Nov 3, 2015
fbfd652
Add loaded schematic saving.
Lunatrius Nov 3, 2015
ff236fa
Add an unload button to the control GUI.
Lunatrius Nov 3, 2015
32c813b
Add the locale to all toLowerCase calls.
Lunatrius Nov 22, 2015
7dc8842
Update to 1.8.8.
Lunatrius Dec 21, 2015
2d4202d
Update gradle wrapper.
Lunatrius Dec 21, 2015
9fc04ba
Update to 1.8.9.
Lunatrius Dec 30, 2015
61ef75e
Fix a file name in the README.
Lunatrius Dec 30, 2015
9dab089
Minor tweaks to rendering code.
Lunatrius Jan 18, 2016
5d0a1be
Compute the air block highlight based on the real world blocks. Fixes…
Lunatrius Jan 30, 2016
f035d8a
License year update.
Lunatrius Feb 28, 2016
cc43077
Update to 1.9.
Lunatrius Mar 26, 2016
db0b1ea
Update Forge version and mappings.
Lunatrius Apr 14, 2016
3dc91b4
Override the default chunk render count to prevent excessive memory u…
Lunatrius May 7, 2016
c04fabb
Add stack formatting and required amount to the material UI.
Kamesuta Mar 29, 2016
d3cc560
Update French translation
RedNesto May 30, 2016
dd8261f
Update to 1.9.4.
Lunatrius Jun 5, 2016
9a8907b
Add a separate pick block key binding.
Lunatrius Jun 5, 2016
2f07b41
Bump the version number.
Lunatrius Jun 5, 2016
7cd5020
Fix a key binding conflict with vanilla. Fixes gh-158
Lunatrius Jul 2, 2016
0e3fdaf
Merge pull request #147 from RedNesto/update-fr-translation
Lunatrius Jul 2, 2016
2fe4b06
Update to 1.10.2.
Lunatrius Jul 3, 2016
7a4d8fb
Fix a NPE introduced in 1.9.x. Fixes gh-162
Lunatrius Jul 8, 2016
9e23fd5
The schematic chunk provider must extend the client chunk provider be…
Lunatrius Jul 30, 2016
6ee69c4
Fix block placement when adjacent blocks are not required. Fixes gh-170
Lunatrius Oct 1, 2016
096d8c4
Add a special case for double slabs to the block list counter. Closes…
Lunatrius Nov 5, 2016
7e8e3a0
Update to 1.11.
Lunatrius Dec 3, 2016
44fc3b4
Fix dependency modids.
Lunatrius Dec 3, 2016
732917c
Fix the path merging check to use startsWith instead of contains.
Lunatrius Dec 18, 2016
50fba04
Fix air blocks/items appearing in the material list.
Lunatrius Dec 18, 2016
0956921
Add a special case for fluids. Closes gh-186
Lunatrius Dec 18, 2016
45294cc
Replace null checks with .isEmpty() checks.
Lunatrius Dec 19, 2016
2c2f5b8
When the schematic directory is a relative path, use the internal dat…
Lunatrius Dec 29, 2016
86f9ba5
Add a missing particle override. Fixes gh-200
Lunatrius Feb 16, 2017
f995376
Disable guide rendering on a setting reset. Fixes gh-199
Lunatrius Feb 23, 2017
4d46b34
Add placement mappings for end rods, observers and command blocks. Cl…
Lunatrius Apr 2, 2017
272d9f5
ru_ru: update
Jerozgen Jun 18, 2017
ab89f6c
Merge pull request #227 from Jerozgen/master
Lunatrius Jun 18, 2017
898851e
Add eclipse launch files to .gitignore.
Lunatrius Jul 20, 2017
f212e5b
Clean up unnamed method parameters
Pokechu22 Jul 11, 2017
39e18df
Remove bare section signs
Pokechu22 Jul 11, 2017
8aed542
Indicate the position in the schematic that is being looked at
Pokechu22 Jul 11, 2017
4dbcf15
Update to 1.12.
Lunatrius Jul 25, 2017
97e44e7
Replace anonymous classes with lambdas.
Lunatrius Jul 25, 2017
a88567c
Render all exterior sides in the overlay regardless of the block's sides
Pokechu22 Jul 21, 2017
1663c7f
Merge pull request #240 from Pokechu22/repeater-comparator
Lunatrius Aug 1, 2017
bc5ed43
Implement loading and saving schematics in the structure block format
Pokechu22 Jul 22, 2017
47c6bb3
Allow selection of the schematic format in the UI
Pokechu22 Jul 22, 2017
0f1701f
Allow format specification in /schematicaSave
Pokechu22 Jul 25, 2017
d5cc7db
Use full filenames in commands
Pokechu22 Aug 18, 2017
aab209a
Merge pull request #250 from Pokechu22/structure-format
Lunatrius Aug 19, 2017
79abcfc
Fix some minor issues and add non-null annotations to command related…
Lunatrius Aug 20, 2017
5952640
Update to 1.12.1.
Lunatrius Aug 27, 2017
f4d6215
Update to 1.12.2.
Lunatrius Oct 11, 2017
9247682
Add support for rendering all layers below the current layer
Pokechu22 Nov 17, 2017
5a445d7
Merge pull request #289 from Pokechu22/layers-below
Lunatrius Nov 20, 2017
e4135f5
Sort folders and schematic files. Fixes gh-73
Lunatrius Nov 28, 2017
485a0bd
Update ru_ru
Jerozgen Nov 28, 2017
7171cb0
Add missing null checks. Fixes gh-299
Lunatrius Jan 6, 2018
e663b48
Add additional null checks to prevent crashes under certain condition…
Lunatrius Apr 22, 2018
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
26 changes: 26 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# default
* text eol=auto

# git
.gitattributes text eol=lf
.gitignore text eol=lf

# sources
*.java text eol=lf

# resources
*.lang text eol=lf
*.cfg text eol=lf
*.info text eol=lf
*.mcmeta text eol=lf
*.md text eol=lf
*.xml text eol=lf

# scripts
*.bat text eol=crlf
*.gradle text eol=lf
*.properties text eol=lf

# binaries
*.png binary
*.jar binary
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@
/.classpath
/.project
/bin
*.launch

## intellij
/out
/.idea
/*.iml
/*.ipr
/*.iws
44 changes: 44 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
## Contributing
### Submitting a Pull Request (PR)
So you found a bug in the code? Think you can make it more efficient? Want to help in general? Great!

1. If you haven't already, create a [GitHub account](https://github.com/signup/free).
2. Click the `Fork` icon located at the top-right of this page (below your username).
3. Make the changes that you want to and commit them.
* If you're making changes locally, you'll have to do `git add -A`, `git commit` and `git push` in your command line.
4. Click `Pull Request` at the right-hand side of the gray bar directly below your fork's name.
5. Click `Click to create a pull request for this comparison`, enter your pull request title, and create a detailed description explaining what you changed.
6. Click `Send pull request`, and wait for feedback!

#### Instructions/Advice when submitting a Pull Request (PR)
I use [this](https://gist.github.com/460be5119b93d73c24ab) IDEA formatting. To be short:

* spaces for indentation
* braces on same lines

When you finish up your PR you'll want to [squash](http://davidwalsh.name/squash-commits-git) them into a single commit (unless it makes sense to have them split).

1. Make sure your working directory is clean by executing `git status`.
2. Execute `git rebase -i HEAD~X` where `X` is the amount of your commits. This will make sure you squash only your own commits.
3. You should now see a list of all your commits, prefixed with `pick`. Change all instances of `pick` (excluding the first!) into `squash` or simply `s`. Then save/quit the editor once.
4. A second screen should show up, displaying all the commit messages (you may edit them, delete or add some). After your done save/quit the editor again.
5. If git successfully rebased things simply push your cleaned up commits by executing `git push -f`.

#### Localization
You should always use `en_US.lang` as the base for localization to other languages. To modify the files you have two options:

* Create or modify the file directly with your favorite text editor (make sure encoding is set to `UTF-8`!).
* Use [this](http://mc.lunatri.us/translate) website to load the base file (and optionally the target language if you're updating localizations).
_Note: you **must** use the link to the `Raw` file._

### Creating an Issue
Crashing? Have a suggestion? Found a bug? Create an issue now!

1. Make sure your issue hasn't already been answered or fixed. Also think about whether your issue is a valid one before submitting it.
2. Click `New Issue` right below `Star` and `Fork`.
3. Enter your issue title (something that summarizes your issue), and then add a detailed description ("Hey, could you add/change stuff?" or "Hey, found an exploit: stuff").
* If you are reporting a bug, make sure you include the following:
* The log file `fml-client-latest.log` (or `fml-server-latest.log`) uploaded to [gist](https://gist.github.com/).
* Detailed description of the bug.
* Include steps on how to reproduce the bug (if possible).
4. Click `Submit new issue`, and wait for feedback!
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Jadran "Lunatrius" Kotnik

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
9 changes: 9 additions & 0 deletions LICENSE-EXCLUSIONS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
##############################################################################

logo.png (commit: 8867629) (c) by razarosu (MCF)

logo.png (commit: 8867629) is licensed under a
Creative Commons Attribution-NoDerivatives 4.0 International License.

You should have received a copy of the license along with this
work. If not, see <http://creativecommons.org/licenses/by-nd/4.0/>.
73 changes: 3 additions & 70 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
## Welcome to Schematica!
[Compiling Schematica](#compile-schematica) - for those that want the latest unreleased features

[Contributing](#contributing) - for those that want to help out

### Compiling
[Setup Java](#setup-java)

[Setup Gradle](#setup-gradle)

[Setup Git](#setup-git)

[Setup Schematica](#setup-schematica)
Expand Down Expand Up @@ -37,28 +31,6 @@ The Java JDK is used to compile Schematica.
7. Append `;%JAVA_HOME%\bin` EXACTLY AS SHOWN and click `Ok`. Make sure the location is correct; double-check just to make sure.
3. Open up your command line and run `javac`. If it spews out a bunch of possible options and the usage, then you're good to go. If not try the steps again.

#### Setup Gradle
***
You may skip this entire section and use the provided Gradle wrapper instead (use `gradlew` instead of `gradle`).
***
Gradle is used to execute the various build tasks when compiling Schematica.

1. Download and install Gradle.
* [Windows/Mac download link](http://www.gradle.org/downloads). You only need the binaries, but choose whatever flavor you want.
* Unzip the package and put it wherever you want, eg `C:\Gradle`.
* Linux: Installation methods for certain popular flavors of Linux are listed below. If your distribution is not listed, follow the instructions specific to your package manager or install it manually [here](http://www.gradle.org/downloads).
* Gentoo: `emerge dev-java/gradle-bin`
* Archlinux: You'll have to install it from the [AUR](https://aur.archlinux.org/packages/gradle).
* Ubuntu/Debian: `apt-get install gradle`
* Fedora: Install Gradle manually from its website (see above), as Fedora ships a "broken" version of Gradle. Use `yum install gradle` only if you know what you're doing.
2. Set up the environment.
* Windows: Set environment variables for Gradle.
1. Go back to `Environment Variables` and then create a new system variable.
2. For `Variable Name`, input `GRADLE_HOME`.
3. For `Variable Value`, input something similar to `C:\Gradle-1.10` exactly as shown (or wherever your Gradle installation is), and click `Ok`.
4. Scroll down to `Path` again, and append `;%GRADLE_HOME%\bin` EXACTLY AS SHOWN and click `Ok`. Once again, double-check the location.
3. Open up your command line and run `gradle`. If it says "Welcome to Gradle [version].", then you're good to go. If not try the steps again.

#### Setup Git
Git is used to clone Schematica and update your local copy.

Expand All @@ -80,9 +52,9 @@ This section assumes that you're using the command-line version of Git.
***

#### Compile Schematica
1. Execute `gradle setupDevWorkspace`. This sets up Forge and downloads the necessary libraries to build Schematica. This might take some time, be patient.
* You will generally only have to do this once until the Forge version in `build.properties` changes.
2. Execute `gradle build`. If you did everything right, `BUILD SUCCESSFUL` will be displayed after it finishes. This should be relatively quick.
1. Execute `gradlew setupDevWorkspace`. This sets up Forge and downloads the necessary libraries to build Schematica. This might take some time, be patient.
* You will generally only have to do this once until the Forge version in `gradle.properties` changes.
2. Execute `gradlew build`. If you did everything right, `BUILD SUCCESSFUL` will be displayed after it finishes. This should be relatively quick.
* If you see `BUILD FAILED`, check the error output (it should be right around `BUILD FAILED`), fix everything (if possible), and try again.
3. Go to `mcdev\Schematica\build\libs`.
* You should see a `.jar` file named `Schematica-#.#.#-#.#.#.#-universal.jar`.
Expand All @@ -97,43 +69,4 @@ In order to get the most up-to-date builds, you'll have to periodically update y
* If you have, try reverting them to the status that they were when you last updated your repository.
4. Execute `git pull master`. This pulls all commits from the official repository that do not yet exist on your local repository and updates it.

### Contributing
#### Submitting a Pull Request (PR)
So you found a bug in the code? Think you can make it more efficient? Want to help in general? Great!

1. If you haven't already, create a [GitHub account](https://github.com/signup/free).
2. Click the `Fork` icon located at the top-right of this page (below your username).
3. Make the changes that you want to and commit them.
* If you're making changes locally, you'll have to do `git add -A`, `git commit` and `git push` in your command line.
4. Click `Pull Request` at the right-hand side of the gray bar directly below your fork's name.
5. Click `Click to create a pull request for this comparison`, enter your pull request title, and create a detailed description explaining what you changed.
6. Click `Send pull request`, and wait for feedback!

##### Instructions/Advice when submitting a Pull Request (PR)
I use [this](https://gist.github.com/460be5119b93d73c24ab) IDEA formatting. To be short:

* tabs for indentation
* braces on same lines

When you finish up your PR you'll want to [squash](http://davidwalsh.name/squash-commits-git) them into a single commit (unless it makes sense to have them split).

1. Make sure your working directory is clean by executing `git status`.
2. Execute `git rebase -i HEAD~X` where `X` is the amount of your commits. This will make sure you squash only your own commits.
3. You should now see a list of all your commits, prefixed with `pick`. Change all instances of `pick` (excluding the first!) into `squash` or simply `s`. Then save/quit the editor once.
4. A second screen should show up, displaying all the commit messages (you may edit them, delete or add some). After your done save/quit the editor again.
5. If git successfuly rebased things simply push your cleaned up commits by executing `git push -f`.

#### Creating an Issue
Crashing? Have a suggestion? Found a bug? Create an issue now!

1. Make sure your issue hasn't already been answered or fixed. Also think about whether your issue is a valid one before submitting it.
2. Go to the issues page.
3. Click `New Issue` right below `Star` and `Fork`.
4. Enter your issue title (something that summarizes your issue), and then add a detailed description ("Hey, could you add/change xxx?" or "Hey, found an exploit: stuff").
* If you are reporting a bug, make sure you include the following:
* Version (can be found in the mcmod.info file or in the mod list)
* ForgeModLoader log (please use [gists](https://gist.github.com/) for large amounts of text!)
* Detailed description of the bug
5. Click `Submit new issue`, and wait for feedback!

Shamelessly based this README off [pahimar's version](https://github.com/pahimar/Equivalent-Exchange-3).
Loading