tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2694 commits 7 branches 98 tags 24 MiB
Commit graph

1015 commits

Author SHA1 Message Date
yueh
035dc244ff Added missing @Override annotations 2016-09-17 17:00:10 +02:00
yueh
2e7efb3660 Added missing newlines 2016-09-17 16:57:09 +02:00
yueh
329d34f8e5 Fixes light blue and gray cables due to renaming 2016-09-17 16:38:12 +02:00
yueh
93145750c0 Added missing file headers 2016-09-17 16:00:37 +02:00
yueh
067da3fec0 Deprecated IExternalStorageHandler in favour of IItemHandler 2016-09-17 15:27:23 +02:00
yueh
7ae4cc86c7 Added TODO for API classes needing investigation 2016-09-17 15:22:16 +02:00
yueh
860636d067 Removed deprecated API methods 2016-09-17 15:08:47 +02:00
yueh
f185bc07a6 Capitalised enums to match conventions 2016-09-17 15:06:00 +02:00
yueh
2d1d29eb37 Removed AE1 API artifact for bees 2016-09-17 14:49:40 +02:00
yueh
1102b89009 Added missing file headers 2016-09-17 14:48:31 +02:00
Sebastian Hartte
d48e7e1f6d Implemented spatial pylon rendering. 2016-09-15 22:12:53 +02:00
Sebastian Hartte
653ba814cc Reverted debugging code. 2016-09-14 00:52:43 +02:00
Sebastian Hartte
7584d00681 Added crafting monitor item TESR (refactored out item rendering of that kind into a shared class). 
Fixes server startup issues due to sidedness.
 2016-09-14 00:50:02 +02:00
Sebastian Hartte
9c561d550b Fixes API compilation problem. 2016-09-13 19:58:38 +02:00
Sebastian Hartte
11625ea240 Remove custom packet send to server for part placement since this is triggered again on the server automatically by forge. 2016-09-12 20:52:32 +02:00
Sebastian Hartte
d79514e4a0 Fixes missing particle texture (causes crashes in certain scenarios like breaking the block with a pickaxe). 2016-09-12 01:50:12 +02:00
Sebastian Hartte
6a5add38e2 Fixes incorrect onItemUse declaration, which in turn fixes the color applicator. 2016-09-12 01:46:55 +02:00
Sebastian Hartte
5b6ed0cfd0 First pass of implementing rendering for crafting cubes (#7) 2016-09-12 01:11:38 +02:00
Sebastian Hartte
f35a951b09 Restored original replicator card texture. 2016-09-10 18:39:19 +02:00
Sebastian Hartte
99b73957c1 Energy Cell fill property had incorrect range (Fixes #10) 2016-09-10 17:43:49 +02:00
Sebastian Hartte
73b9e83b9f Added block models for debug blocks. Fixes #6. 2016-09-10 17:36:33 +02:00
Sebastian Hartte
9246639709 Fixes missing model exceptions being swallowed by Forge due to our model customization step. 2016-09-10 13:41:56 +02:00
Sebastian Hartte
3403e47b02 Fixes vibrant quartz glass using the wrong model. 
Fixes matrix frame not having a model (the block is transparent though).
Don't register an item model for the invalid part anymore.
Make variant registration for items more explicit.
This fixes #5
 2016-09-10 13:19:21 +02:00
Sebastian Hartte
418e44390d Added models for debug items. Fixes #4. 2016-09-10 11:09:31 +02:00
Sebastian Hartte
1c93cc8f15 Fix locked monitor textures. 2016-09-10 01:01:47 +02:00
Sebastian Hartte
7e027da804 Reimplemented cable and parts rendering. 2016-09-10 00:56:28 +02:00
Sebastian Hartte
0b756708d4 Improvements on the item model for facades, disabled 3d in gui to improve lighting. 2016-08-28 13:25:31 +02:00
Sebastian Hartte
5313d61490 Added item models for facades. 2016-08-28 12:10:40 +02:00
Sebastian Hartte
77cb3d8b92 Added light detector item and block model. 2016-08-27 18:45:25 +02:00
Sebastian Hartte
81984b3ad7 Implemented ME chest item + block model. 2016-08-27 18:12:54 +02:00
Sebastian Hartte
5465527ea0 Added item texture and default block texture for molecular assembler (no "active" version yet). 2016-08-27 14:18:47 +02:00
Sebastian Hartte
974b910acc Added item models for all crafting multiblock parts. (And their block counterpart textures). 2016-08-27 13:38:11 +02:00
Sebastian Hartte
154f9d9ebb Added spatial pylon item model (and textures for connected texture blocks). 2016-08-27 13:23:45 +02:00
Sebastian Hartte
cafacc8dd4 Initial models (block/item) for QNB (no multi-block yet). 2016-08-27 13:16:27 +02:00
Sebastian Hartte
77dff3ab32 Implemented crank TESR. 
Fixed crash bug in model rotator if state wasn't set.
 2016-08-27 13:05:41 +02:00
Sebastian Hartte
f0ee7939a2 Implemented item models for all cable bus parts (except facades). 2016-08-27 12:23:08 +02:00
Sebastian Hartte
cb9185fb3f Implemented crafting terminal and illuminated panels item models. 2016-08-27 10:50:54 +02:00
Sebastian Hartte
63a311f601 Interesting enough, in 1.7, everything that derives from AbstractPartDisplay swaps the dark / medium variants of the front texture. 2016-08-27 10:39:43 +02:00
Sebastian Hartte
730f5c5d6d Added conversion monitor item model. 2016-08-27 10:30:41 +02:00
Sebastian Hartte
bff03d695b Annihilation plane model. 2016-08-27 10:10:26 +02:00
Sebastian Hartte
686832ebf8 Fixes an issue with detecting straight cable connections. 2016-08-27 00:31:02 +02:00
Sebastian Hartte
b42300a4da Fixes glass cable Z-fighting by making connection points not overlap the center point, as well as removing the unnecessary north/south faces. 2016-08-27 00:10:06 +02:00
Sebastian Hartte
fb04890a50 Fixes the cable bus obstructing lighting and some crash issues when placing/breaking cable buses that have not been assigned a bus container yet. 2016-08-26 23:34:18 +02:00
Sebastian Hartte
1246eb8bdf Improved cable item models to be closer in line with AE had in 1.7. 
Added cable anchors.
 2016-08-26 23:33:49 +02:00
Sebastian Hartte
b62d3ec139 Slight style fix for controller models that also fixes a bunch of startup warnings due to self-referential particle textures. 2016-08-26 23:33:36 +02:00
Sebastian Hartte
0fe53a0d0e Added missing security station files. 2016-08-26 23:32:57 +02:00
Sebastian Hartte
7c4e810c8d Implemented a fix for #35 by implementing getUpdateTag / handleUpdateTag using the existing update package logic. 2016-08-26 23:25:48 +02:00
Sebastian Hartte
71a88aa668 Implemented item models for cables. 2016-08-26 19:07:15 +02:00
Sebastian Hartte
a5398240a0 Removed unused test files. 2016-08-26 17:02:17 +02:00
Sebastian Hartte
0ab4309c52 Fixes controller item model. Apparently item models dont like using a multipart blockstate file. 2016-08-26 16:59:54 +02:00
Sebastian Hartte
9fe692c9bd Fixes broken controller rendering. 2016-08-26 16:55:01 +02:00
Sebastian Hartte
96a9e2f558 Fixed side-scoping issue that prevented the server to start up. 2016-08-26 14:02:24 +02:00
Sebastian Hartte
b28d468935 Implemented security station rendering. 2016-08-26 13:59:59 +02:00
Sebastian Hartte
0316c1de58 Fixed broken name of TileStationSecurity -> TileSecurityStation 2016-08-26 13:51:38 +02:00
Sebastian Hartte
f3e10b1851 Implemented drive models. Fixed issues with the UVL model loader using a null model loader (and thus crashing). 2016-08-26 13:46:52 +02:00
Sebastian Hartte
576923a2f2 Implemented the sky compass. 2016-08-26 13:07:37 +02:00
Sebastian Hartte
d1ccb126b6 Fixed issues with interface file names. 2016-08-26 13:07:12 +02:00
Sebastian Hartte
210d5d2602 Merge fixes for interface. 2016-08-26 12:42:51 +02:00
Sebastian Hartte
c6b9926d7f Restored glass model that implements the uv shift. 
Added a way to register built-in models to support this.
 2016-08-26 12:42:21 +02:00
Sebastian Hartte
ea6c892ec0 Fixes startup warning for missing block, and fixes orientation of stair item models. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
5211bf4c98 Fixes most of the item model issues after registry name changes. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
85cf7d7981 Makes quartz fixture resources and class consistent with the registry name. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
c0b0687fd3 Makes naming of security station related classes/assets consistent with registry name. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
0df62abebd Adds the ability to force a block to use a custom item model. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
dbaa0a9310 Fixes an issue where a custom item model would override the block's default state model. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
e1e649caf7 Fixes glass rendering and item model for vibrant glass. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
d65263f319 Re-enabled custom dispenser behavior and added a convenience registration function for it. 2016-08-26 12:42:21 +02:00
Sebastian Hartte
d831d1302f Added missing custom preInit/init/postInit functionality to the IItemBuilder. 2016-08-26 12:42:21 +02:00
shartte
e276aa682f Replaced all instances of Guava's Optional type with Java 8's Optional type, as discussed in #81. (#90) 2016-08-26 12:42:21 +02:00
shartte
c2a239a12f Implemented registry renaming as discussed in #70 (#89) 
- Implemented registry renaming as discussed in #70 (#89)
 2016-08-26 12:42:21 +02:00
shartte
6f2bbfab4c Major Refactoring of Bootstrap Code (#75) 
- Refactored boostrap code:
  * Completely reworked item/block/tile registration.
  * Fixed server side startup.
  * Fixed server side startup.
  * More documentation.
  * More heavy cleanup
  * More cleanups.
  * Major refactoring of state mapping and fixes a lot of other issue related to item rendering.
  * Fixes sky chest item models (no item TESR).
  * Only use CachingRotatingBakedModel for tile entities automatically.
  Fix default rotation of quartz pillar for item model.
  * Used method reference instead of lambda for ItemMeshDefinition for multiparts.
  * Removed unnecessary IHasSpecialItemModel
  * Removed unused IconReg class.
  * Updated resource pack version.
 2016-08-26 12:42:21 +02:00
shartte
66df324ef0 Implemented interface states and models (#66) 
* Implemented interface states and models.
 2016-08-26 11:09:49 +02:00
shartte
999401c50c Fixes corruption of the lightning particle FX that was caused by an incorrect order of vertex attributes being passed to the vertex buffer. (#43) 
The other FX classes were also adapted to use the same vertex attribute ordering as the vanilla base class.
 2016-08-24 19:07:54 +02:00
dpeter99
255083e00c Fixed sky stome blocks 2016-08-23 11:26:16 +02:00
dpeter99
86083712ad Item Fixes (More) 
- fixed ItemCristalSeed in code please look at that if it is correct :)
- fixed stairs
- added crank item texture
 2016-08-22 11:14:09 +02:00
dpeter99
d010fc9737 Fixed modells 
- fixes #78
- fixed cell workbench
 2016-08-22 09:28:45 +02:00
elix-x
0e2183d234 Removed unused stair classes 
- Removed unused stair classes. Closes #28.
 2016-08-21 10:35:01 +02:00
elix-x
3b7d1685c5 Fixed cable connections rendering, other fixes 
- Fixed cable connections rendering to parts and other tiles.
- Fixed facade & anchors rendering.
- Many other parts related bug fixes.
 2016-08-20 17:15:02 +02:00
elix-x
588b5d91cc Reimplented connected textures with jsons 
- Reimplented connected glass textures using jsons. @shartte can't be
done with jsons, huh?
 2016-08-20 14:38:46 +02:00
elix-x
0c4cb295f3 Reverted glass blocks that used ibaked 
Reverted glass blocks that used ibaked.
 2016-08-20 11:54:07 +02:00
elix-x
d7f32a985d Cables & parts and Baking pipeline 
- Added cables & parts rendering.
- Facades got a completely new way of rendering. Anvil facades are
totally a thing.
- Added baking pipeline for simplified, highly configurable quad baking.

NOTE: Yes, there are a lot of improvements to do, bugs to fix, stuff to
add. I'm just pushing it prior to code structure change, so it does not
get lost in stashes. But it actually works!
 2016-08-19 22:46:13 +02:00
elix-x
8b9743f2bf Cleaned up debug stuff 
Cleaned up debug stuff from naming convention change.
 2016-08-19 22:46:13 +02:00
dpeter99
c70915ffb0 Energy cell updates 
- Added dense texture: fixes #65
- Removes unused cell modell (without a number)
 2016-08-19 13:54:25 +02:00
elix-x
b31e5f5356 Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering 
# Conflicts:
#	src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

#	src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json
# Changed naming convention.
 2016-08-19 12:49:25 +02:00
elix-x
3d2ba425ec Change of naming convention 
Changed naming convention. All AE blocks, items and TEs were affected.
Most of assets were transfered, but some sill need help. Localizations
will be transfered in a separate commit.
Closes #46.
 2016-08-19 12:38:21 +02:00
shartte
153b38b74c Fixes a crash bug when trying to break a block because the damage texture couldn't be generated. (#69) 
Fixes another crash bug where during UVLModelLoader loading, it tried to apply tint but couldn't, because no block was available.
Also fixes a bug where the quad tint wasn't propagated and tinting didn't work.
 2016-08-19 09:23:51 +02:00
elix-x
4abc60cf8e Fixed UVLLoader 
Fixed UVLLoader. Well, kinda. It's waiting for something else to be
fully fixed.
 2016-08-18 11:51:02 +02:00
shartte
25a5108944 Implemented Seed Growth Stages (#49) 
* Implemented growth stages for the crystal items.
* Fixes the pickup delay of dropped seeds so they can actually be grown.
 2016-08-16 19:01:47 +02:00
shartte
845d4da353 Implemented display of icons for MultiItem (#50) 
* Implements rendering of MultiItem items.
 2016-08-16 18:58:28 +02:00
shartte
838691d924 Fixes Paintball Item Rendering (#48) 
* Added a way to register a custom ItemMeshDefinition for items, including registration of custom variants.

* Moved color handling for paint balls into the paint ball class and implemented the correct model selection logic for displaying the items.
 2016-08-16 17:55:56 +02:00
shartte
115f73de2e Implemented Glass Blocks (#51) 
* Implemented connected texture glass blocks (different approach from 1.7).
 2016-08-16 16:04:31 +02:00
shartte
026de7d590 Energy Cell Item Models (#44) 
* Added energy cell item models.

* Removed the client-side only interface and moved to a method in AEBaseBlock instead.
 2016-08-16 15:38:53 +02:00
shartte
785e40ce3e Implemented quartz fixture model (#34) 
* Implemented the actual quartz fixture model.

* Added a custom texture for the metal bits of the quartz fixture.
 2016-08-16 15:38:24 +02:00
elix-x
63f426336b Fixes and cleanup 
- Compile error fixes (blame @biggles2206). Fixes #53.
- UVLModelLoader is now cross compatible with vanilla (vanilla can use
uvl parents who have vanilla parents).
- Due to it, now using uvlMarker instead of .uvl.
- General code reformatting and cleanup.
 2016-08-15 18:19:33 +02:00
shartte
24ddc0e574 Controller Model (#33) 
* Implemented the controller models (using the UVL model loader to make the lights be fullbright at night).
 2016-08-15 10:28:45 +02:00
shartte
a422de6adb Fixes charger model and adds an appropriate item model. (#29) 2016-08-14 13:28:45 +02:00
shartte
7f923d7f25 Added a powered state for the crystal growth accelerator and added corresponding models. (#39) 2016-08-14 13:28:03 +02:00
shartte
5a7d099413 Added active state for vibration chamber and corresponding models. (#40) 2016-08-14 13:27:36 +02:00
shartte
53fd4de0cc Added stair blocks. (#47) 2016-08-14 13:26:53 +02:00
Thomas Saunders
8882c16cbf Move AXIS_ORIENTATION into QuartzPillarBlock 2016-08-14 10:17:50 +01:00
Thomas Saunders
f2cceda471 Move AEBaseBlock.AXIS_ORIENTATION to QuartzPillarBlock 
Move AEBaseBlock.AXIS_ORIENTATION into QuartzPillarBlock since it's used only there
 2016-08-13 18:10:23 +01:00
shartte
92b931434e More item models (#30) 
* Fixed tiny TNT item model.
* Flipped the inscriber north/south and implemented item model.
* Added several item models.
 2016-08-11 13:48:36 +02:00
shartte
8ddff3f459 Fixed blocks state <-> meta conversion (#31) 
-Added missing state <-> meta conversion methods to blocks. Fixes #23.
 2016-08-11 11:40:34 +02:00
elix-x
2208083b03 IHasSpecialItemModel 
IHasSpecialItemModel or IForgetToCommitStuff - #9?
 2016-08-10 14:42:52 +02:00
elix-x
3d1d2a3468 Fixed stairs & chests rendering 
-Fixed chests rendering in inventory (kinda).
-Fixed stairs rendering.
From now on, all blocks with multiple states MUST have item model.
Example stair provided (though with incorrect textures).
Relates to #9.
 2016-08-10 12:10:48 +02:00
elix-x
746bca8c40 Updated forge 
Updated forge.
It had some important fixes & additions.
 2016-08-10 12:07:14 +02:00
elix-x
6aeec56dc0 Removed duplicated crafting things 
Removed duplicated crafting things. For some odd reasons they were using
different blocks and meta at the same time. Probably somebody forgot to
do something while porting 1.7.10 -> 1.8 ;) .
Kinda relates to #9.
 2016-07-25 14:53:14 +02:00
elix-x
d68a7d316c What was forgotten in dc7ddfe 
What was forgotten in
dc7ddfe107.
Closes #24.
 2016-07-23 21:06:17 +02:00
elix-x
dc7ddfe107 Merged stairs feature handler with block's one 
Merged stairs feature handler with block's one.
Relates to #9.
 2016-07-20 15:49:03 +02:00
elix-x
8c5d85d52a Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering 
Merge remote-tracking branch 'origin/1.10-rv3-rendering' into
1.10-rv3-rendering
 2016-07-12 20:08:36 +02:00
elix-x
7a653675de Implemented modular TESR 
-Implemented modular TERS.
-Added ItemRenderable, charger example attached.
 2016-07-12 20:03:54 +02:00
dpeter99
4eccb1e770 New Models 
- Wireless Point
- Tiny TNT
 2016-07-11 21:38:40 +02:00
elix-x
524dc52dd6 Moved F2R, added TESRs, fixed culling 
-Externalized FacingToRotation.
-BlockLightDetector now uses tile based rotations.
-Added TESR methods and TESRs for chests. Can't get it to work in
inventory.
-Fixed rotation bugs involving culling and lighting. Now rotating culled
faces and normals too. Closes #21.
Relates to #9, #10 and #20.
 2016-07-11 15:38:54 +02:00
elix-x
0809ac5625 Implemented automatic rotation 
Implemented automatic rotation for all tile blocks. You can still use
facing properties in model files, if you want to.

Also, some added some fixes and improvements.
 2016-07-05 19:43:51 +02:00
dpeter99
63fb23d1b6 Updated Item models 2016-07-02 17:24:27 +02:00
dpeter99
2e577edc3d Model Update 1 
- Removed textures
- Readded needed ones
- Added models, blockstates
- ChargedQuartzOreBlock
- ChiseledQuartzBlock
- FluixBlock
- QuartzBlock
- QuartzGlassBlock
- QuartzOreBlock
- QuartzPillarBlock
- SkyStoneBlock.BLOCK
- SkyStoneBlock.BRICK
- SkyStoneBlock.SMALL_BRICK
- SkyStoneBlock.STONE
- tile.BlockCellWorkBench
- tile.BlockCharger
- tile.BlockCondenser
- tile.BlockCreativeEnergyCell
- tile.BlockDenseEnergyCell
- tile.BlockDrive
- tile.BlockEnergyAcceptor
- tile.BlockEnergyCell
- tile.BlockGrinder
- tile.BlockInscriber
- tile.BlockIOPort
- tile.BlockSecurity
- tile.BlockSpatialIOPort
 2016-07-02 17:21:51 +02:00
elix-x
9f96b86938 Enabled block states ignoring properties 
Enabled block states ignoring. File with same name as block state, but
with .ignore.json extension. Although it's json extension, it is NOT IN
JSON FORMAT!!! Each line is name of property to ignore. Refers to #10.
 2016-07-01 20:19:10 +02:00
elix-x
e24d166f6a Passing rotations to models 
Implemented passing of rotations to models. Removed unused unlisted
properties. Included dummy grinder model. Found bugs that have to be
fixed.
Referencing #10.
 2016-06-30 15:51:42 +02:00
elix-x
0be0635a8f Fixed item models. 
Fixed all item models. Changed parent to "item/generated" and removed
display rotations as now they're done automatically.
Marks off ~all items in #9.
 2016-06-30 14:17:22 +02:00
elix-x
a2cad01c01 Moved UVLModelLoader to appeng 
Moved UVLModelLoader to appeng. It's working and does not belong to test
anymore. Also updated obf reflection names.
 2016-06-30 12:52:10 +02:00
elix-x
d98f1e8dc3 Updated minecraft to 1.10.2 
Updated minecraft to 1.10.2.
 2016-06-30 12:39:39 +02:00
elix-x
f1aab0f8ef Implemented models loading 
Implemented models loading.
Closes #8.
 2016-06-29 18:56:33 +02:00
elix-x
571db6b48b Fixed blocks & items registration 
Fixed blocks & items registration to use new methods.
 2016-06-29 16:00:04 +02:00
John Hannan
4c4bdff55c Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added 
Merge PR #7 from MoreThanHidden/1.10-rv3-rendering - Particle Texture Atlas Added.
Closes #6.
 2016-06-29 15:30:08 +02:00
elix-x
03aa59521c Removed old rendering system 
Removed old rendering system. Some parts may be left over, but they
won't affect testing.
1.10-R todo tag marks things to do with rendering.
 2016-06-29 12:22:18 +02:00
elix-x
84cfd4c9fc Created and tested UVLLoader 
Created and tested UVLLoader. Yes, it may not conform to code standarts,
but this will be fixed later.
 2016-06-28 15:24:38 +02:00
elix-x
b7b5d2590c Code updated to 1.10 
Code updated to 1.10. NOT 1.9.4 COMPATIBLE!!!
 2016-06-25 11:00:17 +02:00
elix-x
8acee98b8f Third update pass (3/?) 
Last (?) update pass. AE2 can be launched and used (?) in game.

Rendering system changed again and again - rendering is NOT working, to
be rewritten and CAN be done a lot simpler.
 2016-06-21 16:36:15 +02:00
elix-x
05aa6972c4 Second update pass (2/3) - 82 -> 0 errors 
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
 2016-06-21 11:03:10 +02:00
elix-x
5498eb6d7c First update pass (1/3) - ~1400 -> 82 errors 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
 2016-06-19 14:43:27 +02:00
elix-x
d9725a7d9b Updated API to 1.9.4 
Updated API to 1.9.4. All compile errors are fixed in APENG-API.
 2016-06-17 12:54:13 +02:00
Kasama
a122f939e0 Updated pt_BR.lang to match latest en_US 2016-04-27 13:07:06 +02:00
thatsIch
ca21da1421 Improve javadoc of the model generator 2016-02-16 21:09:43 +01:00
thatsIch
aff3941729 Make the project buildable with gradlew build by externalizing the model generator and expose it as an interface 2016-02-16 21:06:59 +01:00
yueh
89a0f12dc4 Updated to minecraft 1.8.9 2016-01-10 01:58:42 +01:00
JJN
fdfc373181 fixed #2090 
fixed #2090
 2016-01-09 23:24:03 +01:00
Adaptivity
fdd16d8876 Ore Dictionary support for recipes 
Added missing changes to oredict.recipe
 2016-01-09 23:23:50 +01:00
Florian Nücke
cff5e7b388 Reworked computer P2P tunnel to use events, and cleaned up reconnection, fixes #2087. 
Just `onTunnelNetworkChange` with tickable is apparently less exhaustive, and less stable. This now avoids issues with network splits and reconnects not being handled in some cases. Also simplified reconnection; there was some duplicate logic in there, with a missing validity check which potentially led to invalid connections.
 2016-01-09 23:23:02 +01:00
yueh
62aa13751b API version will be replaced during build with the correct rv. 2016-01-09 23:19:10 +01:00
yueh
927ecc015b Fixes #2043: Storage buses updates should happen in the correct order. 
This is loosely based on #2032 and should prevent any duplicated event,
but still does a refresh the whole cache due to potentially issues with
some inventories.

It also ensures that storage buses will not announce a CellArrayUpdate
before they are fully initialized, thus no longer causing them to return
null during an update.

Fixes #2403
 2016-01-09 23:17:25 +01:00
yueh
977c9ea70f Merge cleanup 2016-01-01 02:59:20 +01:00
yueh
b62ff9898f Interfaces now slow down with failed crafting attempts. 
Cleanup of unneeded tracking of failed attempts of MultiCraftingTracker.
Followup of #1905
 2016-01-01 02:56:07 +01:00
yueh
02ac8cf220 Refactored the logging 
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.
 2016-01-01 02:55:36 +01:00
Wilhelm Schuster
242c05266f Update and extend German translation 
Add translated achievements.
 2016-01-01 02:45:21 +01:00
yueh
f84b9a7e1d All parameters on one line (for now) 
Easier picking of 1.7 changes
 2016-01-01 02:02:05 +01:00
yueh
e08ab38c52 Added missing annotations 2016-01-01 01:51:10 +01:00
yueh
98234f9935 Use qualified access 2016-01-01 01:50:28 +01:00
yueh
7134e851e4 Use final 2016-01-01 01:49:45 +01:00
yueh
e5d6a40511 Always use {} 2016-01-01 01:49:05 +01:00
yueh
ab689f2a48 Code format 2016-01-01 01:48:15 +01:00
yueh
68c3ea5ae9 Organize imports 2016-01-01 01:47:22 +01:00
yueh
377c7a1c39 Added missing class 2016-01-01 01:45:22 +01:00
AlgorithmX2
71afa9bf53 1.8.8 + deleted all integration can be recovered later or something. 2015-12-31 17:19:44 -06:00
yueh
2e51ea5f78 Always use {} for statements 2015-12-24 02:11:17 +01:00
yueh
4a486673f6 Access using qualified this 2015-12-24 02:10:22 +01:00
yueh
a6ee559723 Final fields, params and variables 2015-12-24 02:09:38 +01:00
yueh
99215e1701 Organized imports 2015-12-24 02:07:03 +01:00
yueh
15664b2822 Fixed some messed up refactoring 2015-12-24 02:05:39 +01:00
yueh
c9e8a6e939 Formatted code 2015-12-24 02:03:16 +01:00
yueh
e94a0cfccf Reduces visibility of internal fields/methods 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
 2015-12-24 01:59:13 +01:00
XFRGod
f054bd699b Update hu_HU.lang 
This is a language "correction"(?) and typo fixing update for the lang file and now it's 110% localized:D
 2015-12-23 14:43:49 +01:00
yueh
3a0eafce3c Fixes #2044: No longer uses internal exceptions 
Added 3 new exception as subclass to FailedConnection to allow a more
precise handling and/or logging.
 2015-12-23 14:43:30 +01:00
XFRGod
daf2587140 Update hu_HU.lang 
Okay now it's absolutely 100% done and I'm officially dead.
Onto EnderIO and Botania then!
 2015-12-23 14:42:28 +01:00
XFRGod
18bf78b379 Update hu_HU.lang 2015-12-23 14:42:05 +01:00
yueh
f2d9a7312b Exception during GridConnection now reports the machine and side. 2015-12-23 14:41:56 +01:00
yueh
f9835e589a Reverts some of the changes to ItemList. 
Removes the split collection as in some rare corner cases the insertion
order is important to maintain the correct data in terms of self cleaning.

Keeps the general cleanups and split of Fluid/ItemList.

Fixes #1964
 2015-12-23 14:41:32 +01:00
thatsIch
18d10e4cc4 Fixes #1995: Allows creation of version checker config file after start up 2015-12-23 14:39:42 +01:00
yueh
9fd183900a Fixes #1983: WorldData cleared too early when still needed. 2015-12-23 14:39:25 +01:00
thatsIch
e922bf02d4 Fixes #1973: 9th slot of ME Interface ignored work 2015-12-23 14:38:26 +01:00
bakaxyf
faaff58fde Update zh_CN.lang 
1728f683c3 d893e52eb0 24224a450b
 2015-12-23 14:38:17 +01:00
yueh
2521f11a40 Fixes #1932: Better VersionChecker exception handling 
ModVersionFetcher will now return a MissingVersion in case of an exception
instead of letting it propagate upwards.

Also added a generic try/catch to the VersionChecker itself, just in case
any unchecked exception might be triggered inside the thread and at least
not logged correctly.
 2015-12-23 14:37:49 +01:00
yueh
1e7126f98e Added an option to toggle oredict subsitutions for patterns. 
It adds a backward compatibility to convert current patterns to use
oredict by default, which should be removed with rv4 stable.

Closes #1156
 2015-12-23 14:34:28 +01:00
thatsIch
888b3e5600 Closes #1899, Fixed #1898: Adds an easy way to export interesting information into CSV format 
Mostly used for the recipe system, but can also be used for debugging purposes. Debug options needs to be ticked to use the full information gain. Recipes only require the normal localization and the specific name plus metadata.

Shifted the recipes into a recipes folder where the CSV will also reside. This will also elevate the copying of the readme to the user directory since it can reside in the recipes folder.

Fixed a bug where the copier would copy the would also copy empty folders
 2015-12-23 14:32:53 +01:00
thatsIch
7dee5699cf sort modifier 2015-09-30 14:27:21 +02:00
thatsIch
ebda927fb5 Add this qualifier 2015-09-30 14:26:54 +02:00
thatsIch
efecd4b8c1 Constant array init 2015-09-30 14:25:59 +02:00
thatsIch
2f65d41cd1 Javastyle array 2015-09-30 14:25:28 +02:00
thatsIch
8b3a954f73 final variables and parameters 2015-09-30 14:24:44 +02:00
thatsIch
059523f543 Reduce scope of variables 2015-09-30 14:22:21 +02:00
thatsIch
dca09fe0a6 Javadoc issues 2015-09-30 14:21:12 +02:00
yueh
3a30ca7570 ItemList refactoring 
Splitted the ItemList and MeaningfulIterator into an item and fluid
version.
Added an IdentityHashMap as additional item layer to the ItemList for a
faster access.
Refactored FluidList, findFuzzy will now return the same fluid instead of
an empty collection.
 2015-09-30 14:18:18 +02:00
thatsIch
71223a9d58 Remove base module 2015-09-30 14:17:15 +02:00
thatsIch
2d71b0e34a prefer isEmpty over length() == 0 2015-09-30 14:16:03 +02:00
thatsIch
430b33b7a3 Replace with array initializer 
this can be done through http://docs.oracle.com/javase/specs/jls/se6/html/arrays.html#10.6
 2015-09-30 14:15:53 +02:00
thatsIch
9d35f65e76 Remove unused imports 2015-09-30 14:14:50 +02:00
thatsIch
209298bb4d Remove redundant type casts 2015-09-30 14:14:12 +02:00
yueh
3b495c35d7 Fixes #1905: Export bus now considers failed crafting requests 
The export bus will now no longer speed up, if more than 1 of the last
crafting requests failed and slow down, if more then 5 failed.

Some code cleanup and moved the custom iterator into the helper package
as it is clearly related to the craftingtracker and not the export bus.
 2015-09-30 14:03:31 +02:00
yueh
c96cf10c86 Fixes 1896: Only update a monitor if the text would change 2015-09-30 14:03:20 +02:00
yueh
174818c6d8 Fixes 1878: Now saves worlddata more reliable. 2015-09-30 14:00:32 +02:00
yueh
97b7583ff2 Fixes incorrect handling of prioritized inventories 
Prioritized inventories are not longer used twice for storing leftover
items and thus finally reporting twice the amount of storable items when
they are the only possible option to store something.

Also fixes import buses now respecting the amount of storable items inside
the network instead of trying to place the exported items back and failing
on any restricted inventory, potentially voiding the overflow.

Fixes #1892
 2015-09-30 13:52:08 +02:00
asd0210a
73f928d57a zh_tw.lang Updated 2015-09-30 13:52:01 +02:00
yueh
0d25b76b77 First iteration of making integrations typesafe 2015-09-30 13:51:47 +02:00
yueh
cdcba63c2d Fixes #1865: Spawn overflow items into the world 2015-09-30 13:42:41 +02:00
yueh
ef6bc3e58f Changed the interface to 9 slots to be consistent with every other machine 2015-09-30 13:42:31 +02:00
yueh
0ce551589e Added a missing whitespace and removed duplicate ones. 2015-09-30 13:42:14 +02:00
Mazdallier
f89f79d71c Update fr_FR.lang 2015-09-30 13:41:25 +02:00
thatsIch
0d312f91af Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-30 13:41:15 +02:00
thatsIch
468cb4e9df Fixes #1588: Charged Certus Quartz Ore was given a wrong name 2015-09-30 13:40:03 +02:00
yueh
6a2056562b Fixed the order craftinglinks are notified for the last item. 
Fixes #1833
 2015-09-30 13:39:24 +02:00
yueh
84fa5a38e0 Reorganizes the recipes in a more reasonable way. 
The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.

It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.

"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.

This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.

Fixes #1791
Reverts #1635
 2015-09-30 13:39:09 +02:00