Commit Graph
177 Commits
Author SHA1 Message Date
aidancbrady 8e1ee9a581 Chunk Loader Upgrades. They work with Digital Miners and automatically adjust to their mining radius. 2016-08-10 15:37:29 -04:00
aidancbrady 5a573b7d44 Creative Bins? Creative Bins. 2016-08-10 14:37:45 -04:00
aidancbrady a3eeda8e10 Fixed shapeless recipes, fixed dye colors 2016-08-10 11:44:07 -04:00
aidancbrady 51342603d4 Merge branch 'development' into 1.9.4
* development:
  Completed Opaque Transmitter implementation. Yay!
  Fix Reactor Ports, again
  Bump up Electrolytic Separator gas output
  Fixed Reactor Port crash
  compleatly replaced files
  removed the word "opaque" in all image names
  added boolean opaque
  added boolean opaque
  loaded config before Tier.init()
  added new opaque images

Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/multipart/TransmitterIcons.java
	src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-07-19 15:19:04 -04:00
aidancbrady 0ae477fd01 Completed Opaque Transmitter implementation. Yay! 2016-07-19 14:03:11 -04:00
aidancbrady 90a587383e Merge branch 'development' into 1.9.4
* development:
  A few minor fixes, added Ultimate Tier Installer texture
  New textures, round 1.

Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2016-07-18 15:56:27 -04:00
aidancbrady cb6682266d Completely transition everything to use new fluid system, including Forge's UniversalBucket. No more old references! 2016-07-12 17:35:24 -04:00
aidancbrady 7b48129909 Merge branch 'development' into 1.9.4
* development:
  Add necessary networking to Reactor Port
  Better tooltips
  Actually fix tier installers
  Add Silicon crusher recipe, fixed Tier Installers
  Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
  Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines

Conflicts:
	build.properties
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/MekanismItems.java
	src/main/java/mekanism/common/item/ItemFactoryInstaller.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityBin.java
	src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
	src/main/java/mekanism/common/tile/TileEntityFactory.java
	src/main/java/mekanism/common/tile/TileEntityFluidTank.java
	src/main/java/mekanism/common/tile/TileEntityGasTank.java
	src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
	src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
	src/main/java/mekanism/generators/common/block/BlockReactor.java
	src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
	src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady 0c4c7ce5f4 Rendering fixes, fixed Bin rotation, fixed placement of bounding block structures 2016-07-06 15:03:27 -04:00
aidancbrady 3505d553d9 Merge branch 'development' into 1.9.4
* development:
  Fixed Robit AI
  Fixed Robit dupe glitch
  Fixed the stupid invalid frequency issue

Conflicts:
	src/main/java/mekanism/client/ClientProxy.java
	src/main/java/mekanism/client/gui/GuiRobitCrafting.java
	src/main/java/mekanism/client/gui/GuiRobitRepair.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/RobitAIPickup.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2016-07-05 18:42:43 -04:00
aidancbrady cdf4b16ec1 Fixed Robit dupe glitch 2016-07-05 17:30:34 -04:00
aidancbrady 06e011e244 Packet crash fixes, fixed Seismic Reader crash, fixed Portable Teleporter interface crash, fixed teleport crash 2016-06-17 16:45:53 -04:00
aidancbrady e4aed3f7c1 Packets should be thread safe now 2016-06-17 15:56:22 -04:00
Lazarix 89d364983b Update ClientProxy.java to use new java arrays
scala.actors.threadpool.Arrays is depreciated in favour of java.util.Arrays.

Fixes issue: cpw.mods.fml.common.LoaderException: java.lang.NoClassDefFoundError: scala/actors/threadpool/Arrays
2016-06-02 00:37:20 +01:00
aidancbrady bba29e64bb Fixed server support, add fancy JEI crafting category items, fix transmitter internal retexturing, fixed SMP particles, fixed glass face culling, fixed laser beam render 2016-05-27 21:14:56 -04:00
aidancbrady 30447e40e2 Fixed balloon colors, fixed transmitter block render, fixed visual disconnect of transmitters on world load 2016-05-26 13:19:08 -04:00
aidancbrady ceec3e71e9 No more errors, the game launches, rejoice! 2016-05-26 03:14:44 -04:00
aidancbrady 79af86daae ~80 errors remaining. Need to properly add offhand support for most items 2016-05-25 23:48:28 -04:00
aidancbrady c73eef6be8 <400 errors 2016-05-25 10:10:47 -04:00
aidancbrady c6a09b5658 <1500 errors 2016-05-24 21:22:39 -04:00
aidancbrady 3983cc858b Begin the great port. 2378 errors to go! 2016-05-24 20:04:40 -04:00
aidancbrady f04899e01c Transmitters render in item form, though I'd love to find a way to disable cull face for these item models 2016-05-24 19:22:59 -04:00
Ben Spiers 55fe80e87e Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-23 01:20:36 +01:00
Ben Spiers 5ca5288736 Properly generify some things 2016-05-23 00:39:34 +01:00
aidancbrady 8954baac9f Fixed Mechanical Pipe internal rendering, add Diversion Transporter and Restrictive Transporter rendering 2016-05-22 18:52:12 -04:00
aidancbrady 5249c0b6c8 Add content renderers for the rest of the transmitters, everything works as far as I can see but for some reason it takes a block update to actually start calling the special renderers 2016-05-21 12:31:36 -04:00
aidancbrady dff7e68916 Start messing around with transmitter special rendering. Still can't see anything 2016-05-20 15:57:13 -04:00
aidancbrady ac7f2f9783 Remove unused commands in .obj and .mtl files, remove Electric Pump and Fluidic Plenisher TESRs 2016-05-19 00:22:20 -04:00
aidancbrady c002ac6d8a Glow Panels render in item form, use getEffectiveSide() instead of isRemote when checking packet security 2016-05-18 19:06:36 -04:00
aidancbrady a10c57fb92 Work on custom model handling 2016-05-18 14:42:45 -04:00
aidancbrady 4205c55093 Start work on generator rendering, I'm gonna stick with ISBRH for now until I decide which models can be transitioned 2016-05-14 23:40:29 -04:00
Ben Spiers d51aa1bb44 Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9 2016-05-12 23:58:19 +01:00
aidancbrady 10098e300d Fixed missing texture errors, fixed bounding block particles, fixed Digital Miner in-world and item render 2016-05-11 23:48:10 -04:00
aidancbrady 20bef9c94f More things are now rendering properly, we're almost done 2016-05-11 20:37:35 -04:00
aidancbrady 8493e6f4d1 Begin overhauling TE renders. Certain blocks are gonna need to remain TESRs 2016-05-11 19:09:28 -04:00
aidancbrady 8b1017a3a8 Lots and lots of fancy rendering! 2016-05-11 17:42:51 -04:00
aidancbrady f4023f8baf Item and Block render of Personal Chest and Solar Neutron Activator 2016-05-11 07:29:43 -04:00
aidancbrady 374cc57515 Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated) 2016-05-10 22:24:37 -04:00
aidancbrady a1100dd47a More render work!
- Added BuildCraft impl to render Model3D
- Got Gas and Fluid icons working properly
- Fixed CTM crash
- Fixed Flamethrower flame rotation issue
- Fluid Tank now renders inner fluid
- Fix some texture errors
2016-05-10 19:37:00 -04:00
aidancbrady 730ee4e450 Loads and loads of render work. I can see the light at the end of the tunnel
- Finished CTM
- BasicBlock item rendering
- Balloon item rendering
- Plastic Fence item rendering
- Started work on Portable Tank fluid item rendering
- Fixed Obsidian TNT and Bin rendering
2016-05-10 15:38:12 -04:00
aidancbrady ddfe83c495 Of course, the issue isn't on Minecraft's end, it has to do with Coord4D hashing. Coord4D no longer extends BlockPos to prevent hash issues 2016-05-09 21:07:18 -04:00
aidancbrady 3b75d9ff1e Loads of work on CTM, work on fixing multi blocks 2016-05-09 00:10:54 -04:00
Ben Spiers ae1a06b925 Get Glow Panels rendering properly again.
(Apart from colour)
2016-05-07 15:47:35 +01:00
aidancbrady 251ab596f5 CTM work 2016-05-06 10:03:56 -04:00
aidancbrady 1b5b4f5ba9 Capes are back in action
Nothing's impossible, @unpairedbracket :)
2016-05-05 19:59:48 -04:00
aidancbrady 0ec37af68c Fixed entity renders, fixed robit logic 2016-05-05 19:24:20 -04:00
aidancbrady 758bc49515 Factory textures & block states, working perfectly 2016-05-05 18:45:40 -04:00
aidancbrady 01a03ecbcf Factory Installer textures, fixed Walkie Talkie and Crafting Formula textures 2016-05-04 19:04:39 -04:00
aidancbrady b8877f9e49 Fixed shards, paxel textures, moved MekanismTools resources to individual assets folder 2016-05-04 16:47:04 -04:00
aidancbrady 2ac38b5016 Walkie Talkie textures! 2016-05-03 23:43:07 -04:00