Commit graph

60 commits

Author SHA1 Message Date
malte0811
20cd180757 Added documentation on the key ring and fixed some bugs with it
Backported other fixes from 1.12
2017-08-04 19:01:24 +02:00
malte0811
78bc37771a Fixed labels breaking the model cache and on dedicated servers, closes #10
(back-port from 1.11)
2017-08-04 18:51:26 +02:00
malte0811
6ca8ca5a0a One more fix for connecting panels using connectors after the panel and the controller have been placed
(back-port from 1.12 via 1.11)
2017-08-04 18:47:46 +02:00
malte0811
6c66ce648a Fixed panels not updating when a connection via panel connectors is broken or placed
(back-port from 1.11)
2017-08-04 18:47:20 +02:00
malte0811
7a5edfa825 Fixed a CME when chunk rendering is multithreaded, see #10
(back-port from 1.11)
2017-08-04 18:41:47 +02:00
malte0811
b1a1b4e62a Allowed multiple components on the same panel network to modify the same RS signal
Cleaned up RS output code for panel components
(Back-port from 1.11)
2017-08-04 18:37:03 +02:00
malte0811
6c6a72ae03 Minor fixes to the previous commits 2017-05-26 17:02:07 +02:00
malte0811
0dd80c3e56 Added a key ring, holds up to 10 keys by default
texture might change, docs+recipe still to do
2017-05-26 16:34:38 +02:00
malte0811
9ba2dcb0b6 Added textures for the key+lock switch
Renaming a key to an empty name returns it to its unnamed state
2017-05-26 13:37:30 +02:00
malte0811
65ba8acbec Finished up the lock switch, just missing textures now
Added a recipe to copy settings from one panel component to another
Some internal changes
2017-05-26 13:33:24 +02:00
malte0811
b11ca376a3 Fixes for the previous commits 2017-05-26 13:26:15 +02:00
malte0811
55e03ab8a4 Started adding locks for panels
# Conflicts:
#	src/main/java/malte0811/industrialWires/CommonProxy.java
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/client/ClientProxy.java
#	src/main/java/malte0811/industrialWires/containers/ContainerPanelComponent.java
#	src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java
#	src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java
#	src/main/java/malte0811/industrialWires/network/MessageComponentSync.java
2017-05-26 13:25:16 +02:00
malte0811
fe7c44f298 Added some IC2 items to the Engineer's toolbox 2017-05-26 13:14:35 +02:00
malte0811
0c52514b15 Glowing components like the indicator light actuall glow in the dark now
Some bugfixes
Complete code reformatting

(Cherry-picked)

# Conflicts:
#	src/main/java/malte0811/industrialWires/IndustrialWires.java
#	src/main/java/malte0811/industrialWires/blocks/BlockIWBase.java
#	src/main/java/malte0811/industrialWires/blocks/EnergyAdapter.java
#	src/main/java/malte0811/industrialWires/blocks/ItemBlockIW.java
#	src/main/java/malte0811/industrialWires/blocks/TileEntityJacobsLadder.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/BlockPanel.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanel.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityPanelCreator.java
#	src/main/java/malte0811/industrialWires/blocks/controlpanel/TileEntityRSPanelConn.java
#	src/main/java/malte0811/industrialWires/blocks/converter/BlockMechanicalConverter.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityIEMotor.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechICtoIE.java
#	src/main/java/malte0811/industrialWires/blocks/converter/TileEntityMechIEtoIC.java
#	src/main/java/malte0811/industrialWires/blocks/wire/BlockIC2Connector.java
#	src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java
#	src/main/java/malte0811/industrialWires/client/ClientEventHandler.java
#	src/main/java/malte0811/industrialWires/client/gui/GuiPanelComponent.java
#	src/main/java/malte0811/industrialWires/client/gui/GuiPanelCreator.java
#	src/main/java/malte0811/industrialWires/client/gui/elements/GuiIntChooser.java
#	src/main/java/malte0811/industrialWires/containers/ContainerPanelCreator.java
#	src/main/java/malte0811/industrialWires/containers/ContainerRSPanelConn.java
#	src/main/java/malte0811/industrialWires/controlpanel/CoveredToggleSwitch.java
#	src/main/java/malte0811/industrialWires/controlpanel/LightedButton.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelComponent.java
#	src/main/java/malte0811/industrialWires/controlpanel/PanelUtils.java
#	src/main/java/malte0811/industrialWires/controlpanel/Slider.java
#	src/main/java/malte0811/industrialWires/crafting/RecipeCoilLength.java
#	src/main/java/malte0811/industrialWires/items/ItemIC2Coil.java
#	src/main/java/malte0811/industrialWires/items/ItemPanelComponent.java
#	src/main/java/malte0811/industrialWires/network/MessageGUIInteract.java
#	src/main/java/malte0811/industrialWires/network/MessagePanelInteract.java
#	src/main/java/malte0811/industrialWires/util/MiscUtils.java
2017-05-26 13:11:15 +02:00
malte0811
0f0232469e Fixed energy loss when not transmitting any energy, closes #7 2017-05-26 12:31:19 +02:00
malte0811
7eecdea794 Build 1.4-8
Added the missing textures
Fixed a few minor bugs
2017-05-10 13:20:00 +02:00
malte0811
aca048cbee Added recipes for all panel related things
Apart from the missing textures everything is ready for a release
2017-05-09 17:25:03 +02:00
malte0811
c680f9a466 Added manual entries for control panel related things
Fixed some problems when playing on a dedicated server
2017-05-08 21:29:45 +02:00
malte0811
7cc0d9d9fe Added toggle switches, including a version with a cover to prevent accidental activation 2017-05-08 17:20:04 +02:00
malte0811
bf66a0fdc7 Added a variable transformer/Variac to put on control panels 2017-05-03 18:08:52 +02:00
malte0811
4586e57b84 Control panels can be disassembled in the panel creator now
added the missing background textures
changed the "base item" for control panels to be a basic machine casing
2017-05-01 18:40:29 +02:00
malte0811
6717e7c815 Added a model for the panel creator 2017-04-29 18:54:21 +02:00
malte0811
4e84a0d020 Added an item model for the control panel
Added some localization&other item models
2017-04-28 20:20:52 +02:00
malte0811
c15e68a716 Added textures for the panel component items
Made it possible to pick up single components from the panel creator GUI
2017-04-27 18:15:11 +02:00
malte0811
d02981e14d Added models for the RS panel connector
Fixed every block dropping the meta=0 version
2017-04-24 17:26:42 +02:00
malte0811
3739fc127c Stopped the user from placing overlapping components
Fixed GUI String rendering size
Fixed panel components not stacking in some situations
Slider length has to be greater than 0.125 now
2017-04-23 17:23:10 +02:00
malte0811
0327322198 Added editing GUI's for the other components
fixed a potential component dupe bug
2017-04-22 18:14:49 +02:00
malte0811
1d83fa7579 Added a GUI for editing panel components
Currently only available for buttons
2017-04-20 20:44:08 +02:00
malte0811
8cabaa9844 Added textures for the panel creator GUI and the control panel block
Fixed bounding box direction on the Jacob's ladders
2017-04-17 19:35:14 +02:00
malte0811
0ee914b7e6 Further work on panel creation
Added items to represent the panel components
2017-04-13 17:14:05 +02:00
malte0811
ee827b46ef Started implementing a GUI for creating control panels
fixed the default value for euPerIf, closes #6
2017-04-12 15:55:37 +02:00
malte0811
4bda8d458c fixed a crash on dedicated servers because for some reason AABB(Vec3d, Vec3d) is client-only
fixed copyright comments
2017-04-10 16:20:39 +02:00
malte0811
838e9c2af4 Control panels now drop properly and can be placed
added a basic GUI to panel RS connectors to allow changing the ID
2017-04-09 16:59:57 +02:00
malte0811
3d4c2ef1f4 Added sliders to control panels, they can be used to set an RS signal between 0 and 15
Commented out the IE gradle dependency since no maven build of IE works with control panels yet (latest master does though)
2017-04-04 17:11:50 +02:00
malte0811
3641775ff5 Control panels now work when connected to multiple RS ports with the same ID
fixed rotation of Jacob's Ladders
2017-04-02 17:16:42 +02:00
malte0811
4ecab259dd More misc control panel stuff
Includes RS indicator lights
2017-04-01 17:33:58 +02:00
malte0811
b1ff95cf85 Further work on control panels
RS output is working (but depends on current master IE with an additional fix)
Model rotation on Jacobs ladders is broken!
2017-03-28 18:15:41 +02:00
malte0811
34bf534b1c started adding control panels. Very much WIP! 2017-03-24 17:40:05 +01:00
malte0811
4a4360c98b Fixed invalid connections being possible, see BluSunrize/ImmersiveEngineering#1975 2017-03-21 18:16:21 +01:00
malte0811
b36e5c2623 General refactoring, IC2 connectors no longer use BlockIEBase! 2017-03-21 18:12:09 +01:00
malte0811
12e18534fe Fixed broken textures on the mechanical converters/motor with Chisel installed, closes #5 2017-03-07 16:52:54 +01:00
malte0811
c3d871aa37 Build 7
fixed the Jacob's Ladders breaking when trying to rotate them
fixed sharp rendering edges inside "salted" arcs
2017-03-06 16:47:16 +01:00
malte0811
59177870f1 added the manual entry on jacobs ladders
fixed jacobs ladders replacing other blocks on placement
2017-03-03 19:04:08 +01:00
malte0811
a15107025d Jacobs ladders cause damage when touched
applying salt to Jacobs ladder's colors the arc orange (due to sodium)
2017-03-03 17:52:22 +01:00
malte0811
7c9d8ff8fb added textures for the jacobs ladders
fixed the normal sized ladder missing a bit of rendering
limited energy input to the side marked as such
2017-03-02 17:26:24 +01:00
malte0811
8a12144490 Progress on the jacobs ladders:
added models for the small and normal sized versions
made them rotatable
fixed sound
energy storage is saved to NBT now
2017-02-28 17:32:40 +01:00
malte0811
2edc831d19 added Jacobs Ladders, part 1
rendering and sound are done, as well as energy usage
ToDo: finish the dimensions of the different ladders, add models for small+normal, recipes, probably a lot more...
2017-02-26 14:04:23 +01:00
malte0811
a113a3d608 added some methods needed for new IE versions
chaged forge version to use to latest
2017-02-21 17:38:15 +01:00
malte0811
3d9f199d66 Build 6
Potentially fixed missing textures/models on the mechanical converters in some cases?
Fixed "old" connectors with full storage not working
2017-01-11 16:40:54 +01:00
malte0811
0e613d05b8 reduced the difference between IC2's wires and IndustrialWires's cables to prevent machines from blowing up when they shouldn't
(There are still differences in some cases, but it works in most cases)
added a "credits" file
2017-01-04 18:31:56 +01:00