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

1211 commits

Author SHA1 Message Date
shartte
4253d659f1 Add Config to Remove Crashing Items from Storage Cells (#2573) 
Added a configuration option to enable players to recover their world if any of their items in storage cause crashes on load.
 2016-11-05 13:50:54 +01:00
Sebastian Hartte
b3560aaa00 Fixes #2571: Only call getDurabilityForDisplay if the item is damageable. 2016-11-05 12:58:15 +01:00
yueh
005392911d Fixed DriverWatcher constantly calling blinkCell instead when changed. 2016-11-05 00:11:02 +01:00
Sebastian Hartte
7f02562e0c Fixes sidedness issues when starting up the server. 2016-11-04 21:02:10 +01:00
yueh
84bc00fa20 Fixes #2567: Use heightmap for very low sea levels. 2016-11-04 16:13:27 +01:00
Sebastian Hartte
c1483d87c7 Fixes #2549: A block being rendered in the translucent layer will cause the item renderer to completely disable depth-writing causing silly looking models when held in hand. 2016-11-04 11:51:24 +01:00
shartte
f5e4a202cb Layers and IC2 Tunnel (#2565) 
* Re-Activated the IC2 layers to implement an IC2 P2P tunnel.
 2016-11-04 11:20:56 +01:00
yueh
6f15c2921a Fixes #2561: Do not use unchecked casts for IContainerListener. 2016-11-04 09:40:21 +01:00
DeadSix27
d891e5da15 Made memory card messages more clearly. (#2511) 
* Made Memory card messages more clearly and easier to understand for newcomers.
 2016-11-04 09:31:52 +01:00
Alexey Krainev
6607c8cd2f Updated russion translation (#2552) 
* Added "P2P Waila Text"
* Changed "NEI to JEI"
 2016-11-04 09:29:25 +01:00
yueh
1e20086799 Extracts item comparison from Platform into their own helper. (#2555) 
* Extracts item comparison from Platform into their own helper.

Renamed methods to be more more fitting for the actual comparison.
Added documentation about each methods behaviour.
 2016-11-04 09:27:52 +01:00
Sebastian Hartte
f85ab7ddc2 Fixes Macerator recipes when IC2 integration is enabled. 2016-11-02 23:45:22 +01:00
Sebastian Hartte
c3700737c3 Re-enables this IF-branch for ore dictionary tokens in the recipe files, which was inactive due to the recipe files all using lower-case verbs. 2016-11-02 23:34:04 +01:00
Sebastian Hartte
2f8013a49b Fixes registration of recipes when one of the recipes throws an unexpected unchecked exception during registration. Before, the registration would simply cancel and not log any errors in this case. Fixes issues with outdated IC2 integration (Macerator recipes) causing certain recipes to become non-functional. 2016-11-02 23:32:20 +01:00
Sebastian Hartte
af54883fd3 Fixes #2558: Make Sky Stone Chest TESR more robust against odd world state, as Vanilla also does. 2016-11-02 20:44:50 +01:00
thatsIch
223a210d49 Replaced reference to FMLCommonHandler EventBus through MinecraftForge.EVENT_BUS due to deprecation notice 2016-11-02 14:22:00 +01:00
thatsIch
c133e4f0ef Removed tickhandler registration from FMLCommonHandler EventBus since they same to MinecraftForge.EVENT_BUS 2016-11-02 14:14:51 +01:00
Sebastian Hartte
2fe5a3cef8 Fixes #2557: Made facades much more robust when rendering. Facades now use string ids for the base item in NBT again to avoid issues when loading worlds with a different Item ID registry mapping. In addition, we don't store the Block metadata instead of the Item Damage anymore, since when reading a facade back in, we were using that block metadata as the item damage, which is technically incorrect. 2016-11-02 01:43:01 +01:00
yueh
a3c33d5323 Fixed typo in prioritylist. 2016-11-01 16:15:05 +01:00
yueh
e927c27b85 Fixes #2554: Extract identical item not any equal one. 2016-11-01 15:51:38 +01:00
yueh
d7d99c5e7e Fixes #2551: Prevent chunk rebuilds when drive is unchanged. 2016-11-01 11:22:35 +01:00
yueh
b6d3be41e1 Fixes #2542: Prevent memory card from opening a GUI 
Some additional cleanup of AEBaseTileBlock#onBlockActivated()
 2016-11-01 10:29:46 +01:00
Sebastian Hartte
071ee83b7a Fixes #2548: Disable item.csv export on the server side, because we're unable to access creative tab information on the server. 2016-11-01 01:39:42 +01:00
Sebastian Hartte
dfe7a29c92 Fixes #2546: When touching an annihilation plane horizontally, use the middle of the entities bounding box on the y-axis to determine whether it is touching the annihilation plane side or not. Otherwise entities did not get picked up when they were *exactly* on the same y-level as the annihilation plane. 2016-11-01 01:05:16 +01:00
Sebastian Hartte
2b02dc19c0 Fixes #2547: Crystal growing and forming fluix crystals was not possible on top of an annihilation plane (or any block with a not-quite-full bounding box), because the crystals thought they were not in water. Fixed by using the center of the crystal bounding box to determine water-status, instead of the bottom center. 2016-11-01 01:03:59 +01:00
shartte
5db7fc8e8c Show P2P-Tunnel Link Status on WAILA (#2545) 
Implemented QoL improvement for P2P tunnels by showing their link status via WAILA.
 2016-10-31 23:55:14 +01:00
Sebastian Hartte
c7eb696d60 Further improves robustness of facades. 2016-10-30 23:42:14 +01:00
Sebastian Hartte
4f53f5910b Fixes #2536: Mark host for save when placing facades. 2016-10-30 15:29:51 +01:00
Sebastian Hartte
971fc3d243 Fixes #2533 and #2531: Slight overhaul to how Facades store the associated item and retrieve the sprite. 2016-10-30 15:19:48 +01:00
Sebastian Hartte
c2b5a58dd2 Fixes #2532: Work around bug in Forge lighting pipeline and UnpackedBakedQuad. 2016-10-30 13:15:42 +01:00
Sebastian Hartte
53c32cc296 #2527: Implements charging of tools via RF (Forge Energy) and Tesla. Tested with Tesla Essentials and EnderIO. 2016-10-30 02:38:20 +02:00
Sebastian Hartte
89299cdb3c Fixes #2525: Light P2P Tunnels not using the correct source for the light value. 2016-10-30 01:41:24 +02:00
Sebastian Hartte
2972f0ddc8 Fixes #2528: World light level not being updated when light-level of cable bus changed after removing parts. 2016-10-30 01:41:03 +02:00
Sebastian Hartte
bd97a6edd5 Fixes #2525: Break particles for all attachments of a cable bus. 2016-10-29 19:44:10 +02:00
Sebastian Hartte
6b90c70755 Fixes #2526: Using 5-bit for 0-32 is not sufficient. Rewrote packet for syncing cables to clients to use an easier to deal with format while still saving space in the normal case (2 sides connected to a cable). 2016-10-29 18:06:10 +02:00
Sebastian Hartte
1832be3118 Removed unused methods. 2016-10-29 18:02:08 +02:00
yueh
a9c5019554 Fixes #2530: Use ItemListIgnoreCrafting to ignore craftable items. 
Wraps the internal inventory into an ItemListIgnoreCrafting to hide
craftable items from it. As the ItemLists will always create a copy of the
actual stack before changing them, it will not affect any itemstack stored
elsewhere.
 2016-10-29 17:54:35 +02:00
Sebastian Hartte
3c7d91b73e Fixes #2529: Forgot to call superclass method for onBlockExploded for tiny tnt. 2016-10-29 11:52:06 +02:00
Sebastian Hartte
ee0bfb9a3a Fixed slab blockstate variants. 2016-10-29 01:35:06 +02:00
Sebastian Hartte
c23f11d8a1 Removed Pneumaticraft References since there is no 1.10 port and it has been inactive since March. 2016-10-28 23:06:52 +02:00
Sebastian Hartte
f598fb3cc4 Fixes an issue when starting without IC2 being enabled. 2016-10-28 22:58:19 +02:00
Sebastian Hartte
6e6e51dc20 Separated TileEntity and External Power Sink arguments to IC2 to emphasize that they don't necessarily need to be the same, and that a tile entity is required for IC2. 2016-10-28 22:58:19 +02:00
Sebastian Hartte
344958aefb Added IC2 integration. 2016-10-28 22:58:19 +02:00
Sebastian Hartte
59544993bd This reverts back to the old way of extending the vertex format with the necessary vertex element for lightmap data, if fullbright quads are enabled. Instead of then enabling the extended vertex format for Optifine, it is disabled if Optifine is detected. 
Since the root cause is actually that the Vanilla lighting pipeline doesn't support such Vertex Formats, we disable it also if the Forge lighting pipeline is disabled.

This also relates to #2489.
 2016-10-27 20:05:18 +02:00
yueh
0bbf898709 Fixes failing testing and adding missing cases. 2016-10-27 19:31:06 +02:00
Alexey Krainev
bbf77dc65f Updated Translation (#2517) 2016-10-27 19:09:31 +02:00
yueh
3600c72709 Fixes #2515: Incorrectly version comparison 
Incorrectly prefer the channel over revision to determine the newest
version.
 2016-10-27 19:01:40 +02:00
yueh
2a206594cf Fixes #2516: Prefix tile entities with modid 
For a transition phase it also registers them under their old names.
 2016-10-27 18:01:55 +02:00
shartte
b977ee89ee Remove External Storage Handler (#2417) (#2508) 
* Implemented an adapter for IItemHandler so it can be used by the Storage Bus.
* Added update hook for inject/extract to ItemHandlerAdapter.
* Implemented ItemHandler and FluidHandler capabilities for the condenser, as replacement for the Void Inventories.
* Removed external storage handler, added capability-based way of accessing a monitorable ME network via the storage bus. Removed special case inventories for the matter condenser.
* Implemented InventoryAdaptor for IItemHandler. This also now fixes molecular assemblers interaction with part interfaces.
 2016-10-26 22:58:23 +02:00
bakaxyf
057754c851 Update zh_CN.lang 2016-10-26 20:15:54 +02:00
Sebastian Hartte
7d3464abf9 Fixes #2500: Implement an IItemHandler that doesn't allow new items to be inserted if there's already an item in the slot, while not resetting progress. 2016-10-25 20:09:53 +02:00
Sebastian Hartte
23f8497dea Fixes #2498: Corrected color of biometric card with hash = 0 and correctly delegate the perspective aware transformations to the base model. In addition, don't allocate an empty cache for all cached models. 2016-10-24 23:11:08 +02:00
yueh
b175c71b84 Fixes #2504: Updated inscriber model to match 1.7.10 2016-10-24 16:29:02 +02:00
yueh
ab974828b0 Fixes #2503: Use correct uv values for charger model 2016-10-24 15:40:12 +02:00
yueh
dafa0e85c9 Replaced a few tabs with spaces like everywhere else. 2016-10-24 15:39:06 +02:00
yueh
581822b234 Fixes #2499: Tiny TNT model and hitbox not aligned. 
Fixes entity renderer translating it 1/4 block to high compared to the
hitbox.
Fixed the hitbox being either a bit too small or too large depending on
the used constructor.
Updated the model for tiny TNT to be a bit more compact.
 2016-10-24 13:15:46 +02:00
yueh
a1ae91af76 Closes #2501: Hide substitution buttons for processing 
Hides the substition button in processing mode to avoid confusion as it is
not usable there as well as not showing it as part of the tooltip.
Further it ensures that patterns are encoded with the setting being
disabled, should we add the support later without breaking existing
setups.
 2016-10-24 11:39:59 +02:00
Sebastian Hartte
364872d75b Fixes some slab issues. 2016-10-22 17:13:01 +02:00
yueh
0177f14051 Fixes #2312: Fixes AEBaseContainer click handling. 
Break the loop instead of returning to allow the transfer to still cleanup
the leftovers afterwards while keeping the current behaviour.
 2016-10-22 15:10:12 +02:00
yueh
83ac99da74 Fixes #2496: Removed potentially superfluous list copy. 2016-10-22 12:32:53 +02:00
Sebastian Hartte
87cebc3e3f Fixes #2433: Readded decorative slabs. 2016-10-21 16:27:17 +02:00
Sebastian Hartte
4b607d8fc8 #2489: Use a default vertex format for the custom lightmap in the cube builder as well. 2016-10-21 13:44:26 +02:00
Sebastian Hartte
ec4bc86266 #2438: Added Tesla support with same conversion ratio as RF. 2016-10-20 00:13:45 +02:00
Sebastian Hartte
5578aba8c8 Removed unused imports as well. 2016-10-19 23:39:14 +02:00
Sebastian Hartte
de3a4afac1 Removed unnecessary getCaps 2016-10-19 22:04:28 +02:00
Sebastian Hartte
a72c97e666 #2438: Implemented forge energy capabilities. Removed other disabled energy units for the time being. 2016-10-19 20:57:59 +02:00
Sebastian Hartte
433d575fd4 Fixes #2467: Straight connections for glass and dense cables are now constrained to the requested connection type on both sides. 2016-10-18 23:47:35 +02:00
Sebastian Hartte
6cdcd8ccc9 Trying to fix #2489: Always use the BLOCK VertexFormat for fullbright quads, and try to disable diffuse lighting for them. 2016-10-18 23:06:54 +02:00
Sebastian Hartte
c333da8fa3 Fixes #2481: Forgot models for PartCableAnchor. 2016-10-18 21:06:14 +02:00
Sebastian Hartte
1786a3c069 Fixes #2451: Removed dependency from ModelResourceLocation for Server. 2016-10-18 08:43:38 +02:00
Sebastian Hartte
35542207d8 Fixes #2471: PacketClick processing on the server was broken by the fix for #2463 2016-10-18 00:32:06 +02:00
Sebastian Hartte
e5decb1325 Fixes #2466: Placement sound for cables / parts was not played back to the player doing the placement. 2016-10-18 00:21:59 +02:00
yueh
41b8754130 Fixes #2484: Return a copied itemstack to prevent forge from consuming it. 2016-10-17 12:31:55 +02:00
Sebastian Hartte
dacce3e7bd Fixes #2470: Implement rendering of the crafting output for encoded patterns when shift is being held. 2016-10-16 23:51:09 +02:00
Sebastian Hartte
c427fa04a7 Fixes #2472: Off by when selecting texture for channels >= 5. 2016-10-16 22:27:21 +02:00
Sebastian Hartte
4102f7b8f5 Fixes #2447: Rotate textures for straight cable connections. 2016-10-15 15:19:22 +02:00
Sebastian Hartte
efaf308a94 Fixes #2465: Disable use of blocks that have extended block state for facades since we have no way of actually providing the extended block state. 2016-10-15 14:32:25 +02:00
Sebastian Hartte
b679079a5a Updated JEI. 2016-10-15 14:31:54 +02:00
Sebastian Hartte
8e7dadf7e9 Fixes #2430: IOrientableBlock somehow went missing from CGAs. 2016-10-15 13:50:10 +02:00
Sebastian Hartte
ea8c02b591 Implemented translucent facades. 2016-10-15 13:40:41 +02:00
Sebastian Hartte
9c69352f9a Fixes #2463: Fixes issues with shift-right-clicking tools into the air. (null-sides weren't supported). 2016-10-15 13:23:45 +02:00
Sebastian Hartte
877f87afe4 Fixes #2414: Sky Compass not respecting placement face. 2016-10-15 13:13:19 +02:00
Sebastian Hartte
c590e7f6e6 Fixes #2377: Paint blocks now render correctly. 2016-10-15 11:50:55 +02:00
Sebastian Hartte
070b35f3db Clarified use of slight face offset. 2016-10-15 00:52:27 +02:00
Sebastian Hartte
7c8ee24f8c Renamed QNB's getConnections to make more sense. 2016-10-15 00:47:45 +02:00
Sebastian Hartte
7761a37d59 Fixes #2431: Implemented multi block rendering for quantum network bridge. 2016-10-14 22:59:14 +02:00
Sebastian Hartte
202dff3a96 Fixes #2376: Implemented coloring on color applicator. 2016-10-14 00:08:42 +02:00
Sebastian Hartte
cfbc6b4543 Modified spatial cells such that they anchor the spatial dimension @ 0,64,0. 
Fixes #1712
 2016-10-13 20:55:46 +02:00
Sebastian Hartte
e82641760b Implemented Biometric Card Hash display. 2016-10-12 23:55:08 +02:00
Sebastian Hartte
2b1c11b0bb Fixes #2455: Avoid using glPushAttr 2016-10-11 21:22:55 +02:00
yueh
69e1c5433f Fixes #2454: Incorrect bottom edge texture rotation on pylons on X axis 2016-10-11 15:38:47 +02:00
Sebastian Hartte
55d66be929 Fixes #2448: Facades items and blocks now use the same algorithm to determine the block texture. 
Facades will now use the correct side to determine the texture to use, and will fall back to general quads.
Fixed crafting of facades on the server by removing the check for model simplicity.
 2016-10-09 21:59:56 +02:00
Sebastian Hartte
5de15d5b2c Fixes #2423 2016-10-09 19:48:47 +02:00
Sebastian Hartte
3f6607028d Fixes #2432: New model for wireless access point which includes status indicators, correct model rotation, and lit/unlit torch variants. 2016-10-09 19:43:01 +02:00
Sebastian Hartte
6369cef465 Fixes #2446: Allow Platform.pickRandom to work with empty lists. 2016-10-09 12:01:31 +02:00
Sebastian Hartte
8e7d63dccb Fixed biome registration for spatial storage cells. 
Fixed matrix block conversion to air when transferring.
Fixed biome initialization of new chunks.
 2016-10-09 01:51:41 +02:00
Sebastian Hartte
0ed8a4c3e8 Fixed spatial sky rendering. 2016-10-09 00:53:17 +02:00
Sebastian Hartte
d9885bd4a8 Fixes #2429: Inscriber TESR 2016-10-09 00:03:29 +02:00
Sebastian Hartte
04ec9ba749 Moving interaction to be server-side only fixes issues with memory cards. Fixes #2425 2016-10-08 20:37:11 +02:00
Sebastian Hartte
0b261aac24 Fixes #2427: Don't render security station UI on top of the block when it's offline. 2016-10-08 13:32:17 +02:00
Sebastian Hartte
8df692053a Added JEI integration (#2436). 2016-10-08 13:06:21 +02:00
Sebastian Hartte
04e4fd10a5 Fixes lumen paintball recipes. 
Fixes flux stairs.
Fixes anything that requires a wrench (network tool) or cutting knife (cable anchors).
 2016-10-05 00:51:27 +02:00
yueh
4cb7a9e6f4 Fixes #2434: Set default pickup delay to custom entities. 2016-10-04 19:18:56 +02:00
Sebastian Hartte
2e2bb12671 Fixes #2375: Recipes should now work. Definitely needs more fine-tuning. 2016-10-04 00:38:58 +02:00
Sebastian Hartte
9b51d54403 Fixes #2415: Renaming remaining items/blocks. 2016-10-03 23:06:57 +02:00
Sebastian Hartte
0720d50f2f Refactored hit particles on cable buses and made the code much nicer. 2016-10-03 21:46:40 +02:00
Sebastian Hartte
8ee6f58656 Fixes #2421: Reimplemented addHitEffects so that block break particles show up again. 2016-10-03 21:34:58 +02:00
Sebastian Hartte
744ac69fb7 Fixes #2419: Particle Textures are required, or the block damage model will crash. Also fixed an issue with textures not being propagated for UVL quads. 2016-10-03 21:34:01 +02:00
Sebastian Hartte
de4acb6098 Fixes #2416: Removes an unused model and fixes breaking particles. 2016-10-03 20:04:12 +02:00
Sebastian Hartte
9eb093d865 Fixes #2392: Using the Minecraft version of Matrix4f will not set it to identity in the constructor, causing the item to disappear. 2016-10-03 17:32:57 +02:00
Sebastian Hartte
03c3dfc3c8 Fixes #2413 2016-10-03 17:09:55 +02:00
yueh
f0e3c6eae9 Fixes #2411: Use correct direction for compass location 2016-10-03 16:11:07 +02:00
yueh
2e6f15655c Fixes #2412: Wrongly declaring SkyStone and SkyStone chest as having subtypes. 2016-10-03 16:06:55 +02:00
yueh
ce454e99be Fixes item export failing due to minecraft returning null instead AIR. 2016-10-03 15:19:15 +02:00
Sebastian Hartte
8087b58851 Fixes #2395 by using new clickType argument. 2016-10-03 14:04:37 +02:00
Sebastian Hartte
ecc447ab2c Removed unused field. 2016-10-03 13:12:14 +02:00
Sebastian Hartte
21f4d5e6b6 Added the "rainbow" effect to molecular assemblers. 2016-10-03 12:57:06 +02:00
Sebastian Hartte
5493757d25 Fixes #2406: Not 100% satisfied with how it renders the item being crafted yet, but more cented than before. 2016-10-03 03:29:52 +02:00
Sebastian Hartte
6933173957 Fixes #2407 2016-10-03 03:00:58 +02:00
Sebastian Hartte
044a9f3b8e Fixes #2379: Changed texture of smooth sky stone chest to remove z-fighting between the overlapping parts. Added block-state files for both chests to fix both loading error logs and add a particle texture. 
Fixed small alignment issue for the knob in the item model.
Fixed orientation issue of the chest (this only fixes north/south).
 2016-10-03 02:52:32 +02:00
Sebastian Hartte
af6310b13e Fixes #2391. Initial forward/up could never be null thus the initial orientation was never set. 2016-10-03 00:33:43 +02:00
Sebastian Hartte
2ab1fc0adf Removed usage of GL11 in favor of using GlStateManager. 2016-10-03 00:23:45 +02:00
Sebastian Hartte
62f224d77b Fixes network tool tooltips. 2016-10-02 23:55:37 +02:00
Sebastian Hartte
0a7df79952 Fixes tooltip in Crafting CPU. 2016-10-02 23:43:17 +02:00
Sebastian Hartte
8c8bd03c0b Fixes two small rendering issues (one being use of GL11), the other being missing depth flag for tab buttons. 2016-10-02 23:39:02 +02:00
Sebastian Hartte
e1237d6b46 Removes unnecessary state setting. 2016-10-02 23:05:13 +02:00
Sebastian Hartte
e3ab7488ff Fixes #2402: Tooltips were being drawn twice for ME GUIs. 2016-10-02 22:58:14 +02:00
Sebastian Hartte
a59cef87de Fixes #2405: Apparently push attrib causes issues (somewhere it messes with the GL state and the internal GL state keeping by MC somewhere). 
Fixes #2404: Most state flags are now automatically taken care of by RenderItem.
Fixes #2409: Fixes text being slightly offset to the top.
 2016-10-02 22:54:28 +02:00
Sebastian Hartte
f316c93e38 Fixes #2403: Force stack size to 1 for removing the stack size display in the crafting amount window. 2016-10-02 21:30:13 +02:00
Sebastian Hartte
a22cc2cedc Another fix for #2398 since the auto rotator doesn't actually apply to the built-in model. 2016-10-02 16:17:28 +02:00
Sebastian Hartte
18ea568e2a Fixes #2398 by switching to use of the auto rotation 2016-10-02 13:31:37 +02:00
yueh
c19d9d49f9 Deleted obsolete invtweaks annotation. 2016-10-02 02:17:18 +02:00
Sebastian Hartte
fdee124875 Fixes #2396 by using channels=0 for unpowered cables. 2016-10-02 00:42:13 +02:00
Sebastian Hartte
895a1a18d8 Re-Added original Waila integration and fixed compilation issues against new API. 2016-10-02 00:35:38 +02:00
Sebastian Hartte
84ac312ba9 Fixed translations for items and blocks. 2016-10-01 16:08:27 +02:00
Sebastian Hartte
7cdbe431e5 Slight clean up for the PartType enumeration. Extracted reflection logic for finding part models into a separate class. Removed unnecessary fields and clarified constructor argument. 2016-10-01 16:01:22 +02:00
Sebastian Hartte
1d0606947b Added capability support to AEBaseInvTile. 2016-10-01 01:53:48 +02:00
Sebastian Hartte
754a1f1de3 Added super calls back in to re-enable attached capabilities. 2016-10-01 01:24:20 +02:00
Sebastian Hartte
882f240307 Implemented capabilities for cable buses in a way that dispatches the capabilities to the parts on the appropriate attachment point. Implemented the capabilities for interface parts and tiles to provide a proof of concept. 2016-09-30 23:53:54 +02:00
Sebastian Hartte
8666936646 Updated forge and MCP mappings to latest version. 2016-09-30 22:13:57 +02:00
Sebastian Hartte
e1455df108 Fixes drawing the dark overlay over slots when item UIs are unpowered. 2016-09-30 20:25:11 +02:00
Sebastian Hartte
fdd75ef3a8 Fixes how several UIs draw their item slots. 2016-09-30 20:21:43 +02:00
Sebastian Hartte
928f623f7e Since the functionality for fixed width tooltips was unused, switched to utilizing standard tooltip rendering. This fixes issues with the screen overlay being miscolored and other item tooltips being broken. 2016-09-29 22:54:54 +02:00
Sebastian Hartte
dde6e9b9d4 Textures for crafting and normal terminal were flipped. 2016-09-29 22:19:55 +02:00
Sebastian Hartte
2de1842445 Implemented facade rendering on the cable bus. 2016-09-29 21:47:50 +02:00
yueh
71396637e3 Organise imports 2016-09-17 17:05:07 +02:00
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