Dave Smith
8d3f8df49c
Updating to 14.23.5.2808; naming fixes where necessary
2019-02-24 12:21:48 -07:00
Xander
41727312bf
use built in world method to check if block is loaded
2017-11-19 17:39:06 +08:00
Xander Victory
2411a1be4d
change ArrayList<Object> to a non null list implementation for network data
2017-11-08 15:08:51 +08:00
Tom Elfring
34e81bb65d
Remove ~350 unsave casts
2017-08-05 19:48:12 +02:00
Tom Elfring
9fc52c6016
Fix some JavaDoc warnings
2017-08-05 18:32:20 +02:00
Tom Elfring
c6be298e87
Fix very stupid issue introduced by renaming
2017-06-26 20:22:01 +02:00
Tom Elfring
0a670c1e0b
Merge upstream
2017-06-20 19:36:05 +02:00
Tom Elfring
a13ce7910d
Update mappings to 20170616
2017-06-16 20:26:39 +02:00
Xander Victory
8599224fca
Fix some more null ItemStacks found with Idea
2017-06-13 14:38:49 +08:00
aidancbrady
6a42eb64e3
Update to 1.11.2. Untested, still using outdated MCMP
2017-03-25 20:35:26 -04:00
aidancbrady
eb7c2d1b78
Merge branch 'development' into 1.9.4
...
* development:
Fixed Turbines unable to be formed in other dimensions
Bump version to 9.0.2
Fixed Personal Chest crash, bumped default Fuelwood Heater generation, added some null checks to prevent crashes
Fixed outputting energy above Integer.MAX_VALUE to other mods, fixed tiered factories not supporting muffling upgrades, fixed boiler valve height interaction
Conflicts:
src/main/java/mekanism/common/LaserManager.java
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/entity/EntityFlame.java
src/main/java/mekanism/common/tile/TileEntityBoilerValve.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityLaser.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
2016-05-28 02:34:55 -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
735106c25e
Begin work on MekanismGenerators
2016-05-12 15:07:54 -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
c6f3c162f9
More work
2016-05-09 19:59:16 -04:00
aidancbrady
eba5f7e356
Work on TileEntity stuff. Details below.
...
I've added the method "Coord4D.safeTileGet()" which is likely going to be necessary in a lot of cases where duplicate TEs could be created- for some reason World.getTileEntity() fails to return the saved TileEntity fairly often.
2016-05-09 18:36:40 -04:00
aidancbrady
fc7b185805
Attempt to fix tile entity persistence
2016-05-09 14:52:56 -04:00
aidancbrady
3b75d9ff1e
Loads of work on CTM, work on fixing multi blocks
2016-05-09 00:10:54 -04:00
aidancbrady
076fc3c383
Merge branch 'development' into 1.8.9
...
* development:
Bump API version numbers
Remove Lead Dust clone
Separate vertical and horizontal textures for small transmitters
Conflicts:
src/main/java/mekanism/api/energy/package-info.java
src/main/java/mekanism/api/gas/package-info.java
src/main/java/mekanism/api/infuse/package-info.java
src/main/java/mekanism/api/lasers/package-info.java
src/main/java/mekanism/api/package-info.java
src/main/java/mekanism/api/reactor/package-info.java
src/main/java/mekanism/api/recipe/package-info.java
src/main/java/mekanism/api/transmitters/package-info.java
src/main/java/mekanism/api/util/package-info.java
src/main/java/mekanism/common/item/ItemOtherDust.java
src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeHorizontalUltimate.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/PressurizedTubeVerticalUltimate.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterHorizontalUltimate.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/SmallTransmitterVerticalUltimate.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterHorizontalUltimate.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalAdvanced.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalBasic.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalElite.png
src/main/resources/assets/mekanism/textures/blocks/models/multipart/SmallTransmitterVerticalUltimate.png
2016-05-02 23:08:40 -04:00
Ben Spiers
78c2afb5ea
Actually get it compiling again.
...
Seems to run ok, I think?
2016-04-25 13:11:26 +01:00
Ben Spiers
84336ec4d1
Merge branch 'development' into 1.8.9
...
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady
87438dcc7f
Boiler work, added heat info tab, worked on polishing heat interactions among machines
2016-02-27 13:32:48 -05:00
Ben Spiers
7b4fefeb60
Fix some of the things that were broken, add more type-specs.
2016-02-08 22:46:06 +00:00
Ben Spiers
0179ea1f38
Mostly rendering improvements
2016-02-01 23:42:30 +00:00
Ben Spiers
c5987588b8
Make Coord4D work as a BlockPos better.
2016-01-30 21:50:22 +00:00
Ben Spiers
8af7ec270a
Fix item package
2016-01-25 00:54:05 +00:00
Ben Spiers
a80f724cc2
Apply various common one-to-one replacements
...
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers
4384dbe376
More API stuff, make Pos3D actually override the Vec3 methods
2016-01-22 00:20:01 +00:00
Ben Spiers
4247ba136a
Fix compile errors in API package
2016-01-16 14:35:01 +00:00
Ben Spiers
9b8d9d92d6
Start update to 1.8.9
...
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady
08eb8be841
A few necessary library additions
2016-01-04 00:33:00 -05:00
Ben Spiers
c9f51bd970
Update some MekanismUtils functions to use Coord4D
2015-07-28 04:58:04 +01:00
Ben Spiers
74939083c8
Fix frame mods moving Teleporters with fake worlds
...
If there is no ChunkProvider, the block can't be unloaded.
2015-07-19 13:40:03 +01:00
Ben Spiers
4a2dde8f87
Fix API, put back some methods that GC uses, optimise imports in API.
2015-04-06 18:53:16 +01:00
Aidan C. Brady
6d36926866
Work on Portable Teleporter, need to fix the screwed up GUI
2015-03-12 16:52:04 -05:00
Ben Spiers
fab95e8900
Re-organise imports.
...
I went for what seemed like a good level of organisation:
Java
__________
Mekanism
__________
Minecraft
Forge
FML
__________
Netty
LWJGL
__________
Other APIs
__________
Static Imports.
2014-09-03 19:00:03 +01:00
Aidan C. Brady
a48a0101e9
Flamethrowers are just about polished! Just need to do a few more entity damage refinements.
2014-07-19 14:41:27 -04:00
Aidan C. Brady
87f92326f9
Work on flame vector calculation - still need to get it to catch blocks and entities on fire properly
2014-07-19 02:34:07 -04:00
Aidan C. Brady
7924531a4e
Dispensers can now latch balloons onto nearby entities, also working Portable Tank GUI
2014-06-19 01:13:23 +02:00
Aidan C. Brady
e5f76907ce
Rewrite networking code for the 100th time to fix memory leak
2014-06-11 11:57:49 +02:00
Aidan C. Brady
1933723b52
Major packet work, I think it's done. 34 errors to go!
2014-06-02 17:33:19 +02:00
Aidan C. Brady
ec2040cccc
Work on networking update
2014-06-01 17:42:23 +02:00
Aidan C. Brady
d1c193d0dd
Loads more work. 275 errors.
2014-05-29 19:01:43 +01:00
tterrag1098
6ac750520c
Blocks and Entities
2014-05-06 03:14:44 -04:00
Ben Spiers
db7121454a
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
...
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00