Commit Graph
49 Commits
Author SHA1 Message Date
Jason Mitchell 275d137ba8 [ci skip] spotlessApply with the new settings 2023-01-28 18:30:34 -08:00
Raven Szewczyk cf41b89ae4 Update buildscript & spotlessApply (#78)
* Update buildscript & spotlessApply

* Add mapping version
2022-07-21 18:26:15 +07:00
HenryLoenwind 2cf3e979df Logic fix for reading the current task from nbt
getCompoundTag() never returns null, it returns a new empty object
instead
2015-09-12 06:46:08 +02:00
HenryLoenwind 3ee13a730e Allow for machines that have tasks that stall at the end
This allows machines to have tasks that are complete but cannot be
finished. With this they can sit there and not use power.
2015-09-08 15:36:58 +02:00
HenryLoenwind 38cddc2405 Fix PoweredTask being hardcoded where it should not be 2015-09-08 15:04:36 +02:00
Matthias Mann 3e7250c751 push/pull XP based on the current recipe 2015-07-11 17:08:25 +02:00
tterrag1098 75bc0f27b9 Merge remote-tracking branch 'origin/master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/BlockEio.java
	src/main/java/crazypants/enderio/EnderIO.java
	src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java
	src/main/java/crazypants/enderio/conduit/ConduitUtil.java
	src/main/java/crazypants/enderio/gui/IconButtonEIO.java
	src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java
	src/main/java/crazypants/enderio/machine/invpanel/BlockInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/PacketGuiSettings.java
	src/main/java/crazypants/enderio/material/ItemFusedQuartz.java
	src/main/java/crazypants/enderio/waila/WailaCompat.java
	src/main/java/crazypants/gui/GuiContainerBase.java
2015-06-02 16:27:52 -04:00
Matthias Mann 8b9cd4a05e optimize canInsertItem 2015-05-24 13:39:53 +02:00
tterrag1098 6324c7ee69 Merge branch 'master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
2015-05-20 10:35:59 -04:00
tterrag1098 6215e39410 Fix machine active state blinking in between successive tasks 2015-05-18 15:16:05 -04:00
tterrag1098 aa06543988 Move base block/TE to EnderCore 2015-05-03 23:25:53 -04:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04:00
Matthias Mann e9f676e7a8 #2345 remember the random chance value when the recipe couldn't be started 2015-04-29 21:26:05 +02:00
tterrag1098 57f665a03e Unify IProgressTile usage, only implement where needed.
Tons of cleanup everywhere, implement final methods in TileEntityEio
2015-04-12 06:02:29 -04:00
tterrag1098 0c105c7c78 Lots of telepad function/GUI work, add some rudimentary rendering 2015-02-16 00:11:52 -05:00
Matthias Mann f0bf4a7b91 update task progress at least once per second 2015-01-28 22:34:19 +01:00
hilburn 4f214be559 Mushroom Farming and fixed some typos
getExperiance made my skin crawl
2014-12-30 17:27:41 +00:00
CrazyPants d4b5fd5a61 #1397 Completed refactor splitting machines into no powered, power receivers, power generators and power handlers (power in and out) 2014-12-14 18:49:38 +08:00
CrazyPants 26c8cf6c76 #1390 #1393 EIO machines and generators now implement only IEnergyReciver or IEnergyProvider instead of IEnergyHandler where appropriate 2014-12-13 15:55:54 +08:00
CrazyPants 92a0ce8f1c #1213 NPE on inserting ingredients into a Vat 2014-11-09 13:21:55 +08:00
CrazyPants fc57c852fc #1142 Dimension Tranciever crash, NullPointerException 2014-10-21 15:18:51 +08:00
CrazyPants f70b5ce37e New Transceiver ready for testing. 2014-10-11 23:48:18 +08:00
CrazyPants 4538116d75 Basics of power working with new dim trans. 2014-10-10 15:29:29 +08:00
CrazyPants 16c5e9bac1 Added per spawn costs to Powered Spawner
Values to be decided.
2014-09-07 02:13:41 +08:00
CrazyPants 48cc9b4bd5 Lots of refactoring and setup for the slice'n'dice. 2014-09-05 01:07:04 +08:00
CrazyPants 1024e28f39 Fixed the farm (including notifications) 2014-09-03 22:58:55 +08:00
CrazyPants 2866f4dd10 Started 2014-09-03 16:35:12 +08:00
CrazyPants f1d0c916d2 #882 SAG Mill doesn't stop crafting silicon from sand when outputs 2014-08-16 22:58:05 +08:00
tterrag1098 d0a2e97b5d Add SAG Mill sounds/particles, fix off-by-one in isActive().
Add nightvision sounds.
2014-08-10 03:17:38 -04:00
CrazyPants a4bfc60b7d Initial work on powered spawner. 2014-06-16 23:05:52 +08:00
CrazyPants 40f4b1fb57 Fixed client sync failing when a machine finishes running. 2014-06-12 19:20:37 +08:00
CrazyPants 1478efedb3 #738 dupe bug with sag mill 2014-06-11 19:08:54 +08:00
CrazyPants a416fdf02b Reduced server overhead of machines by over 90%. Doh! 2014-06-10 14:26:33 +08:00
CrazyPants 4e8ef3f362 It compiles AND crashes a lot. Woohoo! 2014-06-05 17:40:15 +08:00
tterrag1098 ec975567b2 Only machines package remains, lots to do in there. 2014-06-03 07:20:07 -04:00
CrazyPants be5a1fb371 Fixed performance of Vat, SAG Mill and AlloySmelter 2014-05-28 20:16:53 +08:00
CrazyPants faf82aed05 Changed farming mechanic a little so all drops are auto-collected and trees leaves are harvested. 2014-05-17 22:50:16 +08:00
CrazyPants 7c5d1c24a7 Added farm settings to config. Added 'per action' costs. 2014-05-04 15:55:09 +08:00
CrazyPants 3b9e9b22a1 #639 Alloy smelter only smelts one ingot 2014-05-03 14:33:48 +08:00
CrazyPants 7dcd024c18 Basics of the farming block starting to work (wheat, potatoes, carrots + nether wart) 2014-05-01 22:33:34 +08:00
CrazyPants 7c8382c067 #606 Fixed performance issue when EIO machines where full. 2014-04-29 13:31:26 +08:00
cp a726e382a2 Added 'Grinding Balls' to the SAG Mill for > 2x ore output. 2014-04-22 20:51:43 +08:00
cp 2c6dcf3c5f Implemented 'disabling' of sides. 2014-04-21 19:52:07 +08:00
cp 1cf5c6f234 Fixed the machines. 2014-03-28 13:37:21 +08:00
cp 51865af400 More progress on the still. 2014-03-27 13:09:40 +08:00
cp 3ed9e6c399 #520 Alloy Smelter upgrade breaks ME interface 'blocking mode'
#519 Can't shift-wrench to pick up certain TE blocks

Mereged from 1.6,4
2014-03-03 18:23:16 +08:00
cp a1921a3944 Machines getting there. 2014-03-01 00:42:54 +08:00
cp fcf5fdf417 Started on machines. 2014-02-28 22:42:09 +08:00
cp bef5f6193e more moving. 2014-02-28 00:08:24 +08:00