Commit graph

845 commits

Author SHA1 Message Date
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