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

917 commits

Author SHA1 Message Date
yueh
fe1a67ffaa Reduced drive update rate. (#2574) 
Limits drive updates to modulate.
Code cleanup of the TileDrive.
 2016-11-05 19:28:09 +01:00
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
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
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
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
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
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
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
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
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
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