Ben Spiers
aeb00143a2
Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9
2016-05-21 20:09:56 +01:00
Ben Spiers
b8b2fd46e1
Get most of the transmitters rendering properly
2016-05-21 20:09:20 +01:00
aidancbrady
b812330338
Remove printlns
2016-05-21 12:32:32 -04:00
aidancbrady
38b4dab585
Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
...
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism :
Fix some gradle deps and stuff
Transmitter Render Work OBJ models are really nice to work with
2016-05-21 12:31:44 -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
Ben Spiers
ffb114e11c
Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9
2016-05-21 14:21:49 +01:00
Ben Spiers
30510efaaa
Transmitter Render Work
...
OBJ models are really nice to work with
2016-05-21 14:21:11 +01:00
aidancbrady
7b21d0511a
After much tedious work, managed to get universal cable contents to render. All the rest should now be pretty easy.
2016-05-21 02:40:59 -04:00
aidancbrady
dff7e68916
Start messing around with transmitter special rendering. Still can't see anything
2016-05-20 15:57:13 -04:00
Ben Spiers
87d2305860
Merge branch '1.8.9' of github.com:aidancbrady/Mekanism into 1.8.9
2016-05-20 19:13:14 +01:00
aidancbrady
1e461abc3c
JEI integration is done!
2016-05-20 13:46:52 -04:00
aidancbrady
2f7f38f327
A bit more work. Gotta pause to release v9 for 1.7.10 :)
2016-05-20 11:44:30 -04:00
aidancbrady
7183aa21ad
Remove legacy implementations
2016-05-20 11:18:26 -04:00
aidancbrady
261a32ee01
Fixed slurry gas sprites, add chemical machine JEI handlers, start work on remaining machines
2016-05-20 11:13:01 -04:00
aidancbrady
a2143cc81c
Added chance machine JEI support, added fuel display to advanced machine JEI handlers, add classes for remaining machinery
2016-05-20 01:16:10 -04:00
aidancbrady
bdc071582f
Loads of JEI work- got basic machine and advanced machine stuff mostly working, still need to do chance machines and everything else
2016-05-19 23:22:46 -04:00
aidancbrady
be863a4289
Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound
2016-05-19 18:48:59 -04:00
Ben Spiers
d4a6fa43be
IConfigurable capability and PoC for transmitter render
2016-05-19 22:31:38 +01:00
aidancbrady
2f61ea103f
Set up element bounds and hidden items in JEI, also merged in fixed GUIs
2016-05-19 01:31:56 -04:00
aidancbrady
89604ac199
Start on JEI plugin, bump Forge version, fixed Mod ID filters (ItemRegistryUtils)
2016-05-19 00:50:44 -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
9af9adb56d
Use getGeneralQuads() instead of handlePerspective() to fix lighting issues
2016-05-18 20:31:49 -04:00
aidancbrady
2b9e49ad71
Remove all CCLib dependencies
2016-05-18 19:33:10 -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
64f60150df
Colored glow panels, in block form at least! Now to get them to render in item form...
2016-05-18 16:09:35 -04:00
aidancbrady
a10c57fb92
Work on custom model handling
2016-05-18 14:42:45 -04:00
aidancbrady
571a14be17
Fixed continuous block updates, fixed Heavy Water texture
2016-05-18 11:19:00 -04:00
aidancbrady
566907ad0b
GUI fixes, fixed Electrolytic Separator model- need to figure out why heavy water texture is acting weird
2016-05-17 16:25:09 -04:00
aidancbrady
20bd989687
Merge branch 'development' into 1.8.9
...
* development:
Fixed packet security
Fixed 'other dust' registration
Better fake player reporting, thanks to @DraksterAU
Conflicts:
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/tile/TileEntityBasicBlock.java
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java
src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java
src/main/java/mekanism/common/tile/TileEntityChargepad.java
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java
src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityDynamicTank.java
src/main/java/mekanism/common/tile/TileEntityElectricPump.java
src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
src/main/java/mekanism/common/tile/TileEntityFuelwoodHeater.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityInductionCell.java
src/main/java/mekanism/common/tile/TileEntityInductionPort.java
src/main/java/mekanism/common/tile/TileEntityInductionProvider.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/common/tile/TileEntityMultiblock.java
src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java
src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java
2016-05-17 14:23:57 -04:00
aidancbrady
7ae60615e2
Fixed packet security
2016-05-17 13:49:55 -04:00
aidancbrady
1c90980d68
Fixed 'other dust' registration
2016-05-17 13:10:51 -04:00
aidancbrady
9ec5606ec0
Better fake player reporting, thanks to @DraksterAU
2016-05-17 12:37:47 -04:00
aidancbrady
a01562eefe
Fixed config sync, fixed all generator rendering, fixed generator GUI issue
2016-05-17 12:32:35 -04:00
aidancbrady
2bab84e090
Add missing resource
2016-05-17 11:43:51 -04:00
aidancbrady
e308cd161b
More rendering work. I can't figure out the deal with these generator resources, it's freaking me out
2016-05-17 01:11:39 -04:00
aidancbrady
481535fa11
Remove unnecessary models, fixed some missing texture errors, continued work on MekanismGenerators
2016-05-16 21:15:26 -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
aidancbrady
542b39c90b
More MekanismGenerators updating. I've done about everything other than rendering and jsonification
2016-05-13 23:50:45 -04:00
aidancbrady
3b0bcc1e01
More generators work, still working out those errors
2016-05-12 23:16:09 -04:00
aidancbrady
8fc7e9e7e3
Remove lombok references, I thought I stripped all of those
2016-05-12 20:38:35 -04:00
aidancbrady
88bc1dc995
Merge branch '1.8.9' of https://github.com/aidancbrady/Mekanism into 1.8.9
...
# By Ben Spiers
# Via Ben Spiers
* '1.8.9' of https://github.com/aidancbrady/Mekanism :
Get Glow Panels rendering properly again. (Apart from colour)
Update build.gradle for the weird lombok thing the Chisel code uses.
Make transmitters kinda sorta work properly
Fix issue with update not being reobfed. TileEntityBasicBlock doesn't implement ITickable, so its update() doesn't get reobfed. Call update directly from subclasses that do.
Fix crashes with null capability tiles. Also concerns about missing capabilities.
Fix dark Digital Miner
2016-05-12 20:34:50 -04:00
aidancbrady
5675226ce3
Merge branch 'development' into 1.8.9
...
* development:
Fixed Fusion Reactor air block check
Conflicts:
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/generators/common/FusionReactor.java
2016-05-12 20:34:45 -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
ce3bb08411
Fixed Fusion Reactor air block check
2016-05-12 15:27:04 -04:00
aidancbrady
735106c25e
Begin work on MekanismGenerators
2016-05-12 15:07:54 -04:00
aidancbrady
59eca85008
Complete merge, fixed third person perspective, add Digital Miner overlay, clean up Energy Cube tier management
2016-05-12 00:35:39 -04:00
aidancbrady
f51221f5ac
Implemented custom resistance for Refined Obsidian
2016-05-11 23:56:25 -04: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