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

2675 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d109878821 Merge remote-tracking branch 'refs/remotes/origin/1.10-rv3-rendering-vancontext' into 1.10-rv3-rendering 2016-08-20 14:39:54 +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