luacs1998
23c6d0ef55
Update mc version string
...
Or was I not supposed to?
2014-06-26 09:03:22 +08:00
cpw
fcd13f5e71
Merge branch 'master' into prerelease
2014-06-25 20:18:42 -04:00
cpw
24c05a73ce
Merge branch 'master' of github.com:bspkrs/MinecraftForge into bspkrsgui
...
Conflicts:
src/main/resources/assets/forge/lang/en_US.lang
2014-06-25 20:13:36 -04:00
Lex Manos
256d865db6
Update to 1.7.10-pre4.
2014-06-23 21:55:16 -07:00
Christian
1275aa732e
Null check the Item in the supplied stack as well as the stack itself.
2014-06-22 14:47:24 -04:00
Christian
4778c33902
And fix firing for single player loading.
2014-06-22 14:39:23 -04:00
Christian
127605ec3e
Fix derpity derp.
2014-06-22 10:11:32 -04:00
Christian
f7736e9a0a
Fire an event when a player loads or saves from disk. Mods that want to load an additional
...
player related file from the players dir can now do so in that event.
2014-06-21 17:38:21 -04:00
Thog92
a905fe578b
Add missing 1.7 biomes to BiomeDictionary
2014-06-19 19:06:27 +02:00
ganymedes01
85497cbf6e
Added FluidStack sensitive version for Fluid's localised name
...
Would be helpful for determining names for more complex FluidStacks (with tag compounds for example)
2014-06-18 15:26:14 +01:00
Zarathul
e68cfa9f72
Fixed ArrayIndexOutOfBoundsException in getOreName
...
Added sanity check to prevent ArrayIndexOutOfBoundsException in getOreName for negative ids.
2014-06-16 23:00:40 +02:00
bloodshot
61a6b67d51
Don't call ChunkDataEvent.Load async
...
ChunkDataEvent.Load must be called after TE's are loaded since this is
what mods expect. The event is handled by ChunkIOProvider during
callStage2.
2014-06-13 00:52:13 -04:00
LexManos
96286b77f9
Merge pull request #938 from bloodmc/chunkasync
...
Load chunks asynchronously for players.
2014-06-12 17:43:28 -07:00
Lex Manos
1b7190c50b
Pop version for new Recomended build.
2014-06-12 15:16:56 -07:00
Travis Watkins
e6bbcf6a3d
Load chunks asynchronously for players.
...
When a player triggers a chunk load via walking around or teleporting
there is no need to stop everything and get this chunk on the main thread.
The client is used to having to wait some time for this chunk and the
server doesn't immediately do anything with it except send it to the
player. At the same time chunk loading is the last major source of file IO
that still runs on the main thread.
These two facts make it possible to offload chunks loaded for this reason
to another thread. However, not all parts of chunk loading can happen off
the main thread. For this we use the new AsynchronousExecutor system to
split chunk loading in to three pieces. The first is loading data from
disk, decompressing it, and parsing it in to an NBT structure. The second
piece is creating entities and tile entities in the chunk and adding them
to the world, this is still done on the main thread. The third piece is
informing everyone who requested a chunk load that the load is finished.
For this we register callbacks and then run them on the main thread once
the previous two stages are finished.
There are still cases where a chunk is needed immediately and these will
still trigger chunk loading entirely on the main thread. The most obvious
case is plugins using the API to request a chunk load. We also must load
the chunk immediately when something in the world tries to access it. In
these cases we ignore any possibly pending or in progress chunk loading
that is happening asynchronously as we will have the chunk loaded by the
time they are finished.
The hope is that overall this system will result in less CPU time and
pauses due to blocking file IO on the main thread thus giving more
consistent performance. Testing so far has shown that this also speeds up
chunk loading client side although some of this is likely to be because
we are sending less chunks at once for the client to process.
Thanks for ammaraskar for help with the implementation of this feature.
This commit is based off the following :
Bukkit/CraftBukkit@b8fc6ab2c1
Bukkit/CraftBukkit@85f5776df2
Bukkit/CraftBukkit@0714971ca2
Bukkit/CraftBukkit@7f49722f45
Bukkit/CraftBukkit@53ad0cf1ab
2014-06-12 16:51:17 -04:00
LexManos
c45ed6f6d8
Changed dustLapis to gemLapis to make OM SHUT THE HELL UP.
2014-06-11 22:43:15 -07:00
Lex Manos
dd5b51aac1
Fixed missed metadata offset, and now cache return values of getOres for speed.
2014-06-11 10:27:28 -07:00
LexManos
a08357a845
Merge pull request #1126 from Cojomax99/fog_customization
...
World fog color and density can now be controlled through an event
2014-06-11 00:57:33 -07:00
Cojomax99
9a3bc1fff5
World fog color and density can now be controlled through an event
2014-06-11 10:54:54 +03:00
Lex Manos
7a43d2f96a
Rework OreDictionary's internals to be a bit more speedy to help combat modders using it inapropriatly. Closes #1022 Closes #1131
2014-06-10 18:05:09 -07:00
Lex Manos
03ae909762
Fix inverted parameters in OreDictionary.getOreID Closes #1123
...
-.- Closes #1120
2014-06-04 23:09:13 -07:00
bspkrs
04c2ed554d
Added support for new FML config GUI classes
...
refactored lots of stuff based on comments
added Configuration.load() exception handling and logging
2014-06-04 17:39:47 -04:00
LexManos
f3cbc6c262
Merge pull request #1034 from Adubbz/master
...
Greatly simplified the addition of new biomes to the default world. If this breaks things blame Adubbz.
2014-06-02 17:00:47 -07:00
Lex Manos
42fc3c9516
Added Noteblock change and play events. Closes #1027 #1025
2014-06-02 16:57:04 -07:00
Lex Manos
b301b1f70c
Add target world to PlayerInteractEvent for potential 'cross dimension' interaction such as LittleBlocks. Closes #1071
2014-06-02 15:49:11 -07:00
Lex Manos
eb1ddab278
Add a couple of localizations to Forge added strings. Closes #1068
2014-06-02 15:28:11 -07:00
Lex Manos
f2a33ea9f6
Add comment to RotationHelper telling modders where to actually look, closes #1115
2014-06-02 12:20:28 -07:00
diesieben07
deb5df542e
Add PlayerEvent.StartTracking and .StopTracking & make trackedEntityIDs visible
...
& Update, as discussed on IRC (squash)
2014-05-30 01:59:05 +02:00
LexManos
4a6a49e073
Merge pull request #1109 from Open-Code-Developers/finite-patch
...
Make finite fluid blocks drainable
2014-05-29 15:18:34 -07:00
Lex Manos
0737601dbf
Fix enum helpers for EnumRarity {moved to Commn and changed paramter} and EnumCreatureType {new parameter} and added junit test for them. Closes #1009
2014-05-28 15:28:40 -07:00
Lex Manos
5f90e0788b
Change IShearable JavaDoc by one line so Anti would shut up. Closes #1054
2014-05-26 11:26:53 -07:00
LexManos
96ee4caf39
Merge pull request #1089 from RainWarrior/render-events
...
Added world display list render events
2014-05-25 17:16:08 -07:00
RainWarrior
3980bf79da
Added world display list render events
2014-05-26 04:09:21 +04:00
ganymedes01
6924fef324
Fix getOreIDs not using the wildcard value correctly
...
You can see it's not working by requesting the ore IDs from lapis, and you'll see the name "dye" is missing (and that's the one registered using the wildcard).
Fixed it by inverting the order of the item stack parameters.
2014-05-25 19:15:26 -03:00
Lex Manos
25ef7e3469
Prevent duplciates in registered Ores in the OreDictionary and clean up some of the code, add new function to return all ores the specified ItemStack satisfies. Closes #1102
2014-05-25 14:20:02 -07:00
Vilim
bc1434ff04
Make finite fluid blocks drainable
2014-05-25 19:59:59 +02:00
Vilim
bab2de72bc
Fix fluid blocks
...
For https://github.com/BuildCraft/BuildCraft/issues/1843 .
2014-05-25 18:42:17 +02:00
Lex Manos
243aa60bf9
Add Glass, Colored glass, ore storage blocks, alines, and a few others to ore dicitonary. Closes #1011
2014-05-24 13:01:35 -07:00
Lex Manos
dc10db1d90
Add new PlayerEvent.Clone called when an EntityPlayer is cloned via dimension travil or respawn.
2014-05-24 10:50:52 -07:00
WaDelma
a3e8f0cbe4
Fluid events now know how much fluid is moved
...
Added amount that is being filled/drained to the FluidEvent
Added constructors without amount to ensure backwards compability
Added deprecation to amountless constructors
2014-05-20 01:39:51 +03:00
Lex Manos
711e92a59f
Fully clear DimensionManager's DimensionID bitset when world is loaded. Closes #1074
2014-05-12 11:46:03 -07:00
Christian
26c55d89ef
Fix forge validating strict versions on remote connections.
2014-05-12 13:49:46 -04:00
Adubbz
4454d3f341
Greatly simplified the addition of new biomes to the default world
2014-05-11 15:06:14 +10:00
Lex Manos
c8abc41aa0
Fix extended entity properties being lost when leaving the end, This introduces the concept of calling IExtendedEntityProperties.init when entites/worlds change. Lets see if mods explode.
2014-05-07 14:52:18 -07:00
bspkrs
eb2549c773
New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent
2014-05-07 16:52:10 -04:00
Lex Manos
f81c0cb58f
Fixed hard references in WorldGenBigTree and ForgeCommand that caused worlds to leak in the client.
2014-05-07 12:18:56 -07:00
Bioxx
f848955263
Adds a new ReplaceBiomeBlocks Event constructor that supplies the metadata array if applicable and updates the ChunkProviderGenerate class to pass in the metadata array.
2014-04-29 19:40:32 -04:00
bspkrs
3fa0c70f2b
get a spelling checker :P
2014-04-18 11:21:40 -04:00
Lex Manos
a008339c6e
Bump Forge version in prep for release.
2014-04-16 17:30:50 -07:00
planetguy32
fd59ab261f
Fix infinite loop in RecipeSorter
...
If recipe is multiple levels of inheritance from Object and not categorized, cls=cls.getSuperclass(); needs to be repeated more than once. It must therefore be moved to inside the while loop.
2014-04-12 20:04:02 -07:00
ShetiPhian
bba42d4230
Update PlaySoundEvent17.java
2014-04-03 22:25:49 -04:00
Lex Manos
621fb050ce
Finally do SoundSystem workup for 1.7, Closes #982
2014-04-03 03:12:22 -07:00
Lex Manos
72d22c5827
Update access transformer, Closes #951 and #1021
2014-04-03 02:10:43 -07:00
Lex Manos
12e8d95e9f
Fix potential threading issue if FluidRegistry.loopupFluidForBlock is called from two threads at the same time before being setup. Closes #936
2014-04-02 23:53:05 -07:00
Lex Manos
14b9d639a2
Use BiomeGenBase's array size instead of hardcoding it in BiomeDictionary. Closes #871
2014-04-02 23:46:52 -07:00
Lex Manos
5f62afb5f2
Add AnvilUpdateEvent which is fired when a user places a item in both input slots of a Anvil and allows modders to control the output. Closes #838
2014-04-02 18:33:13 -07:00
Lex Manos
33bf2c8a69
Add ANIMALS tpe to PopulateChunkEvent.Populate Custom providers should call this function if they spawn animals curing population. Closes #790
2014-04-02 17:40:03 -07:00
Lex Manos
aa0c902d22
Advanced Model Loader available server-side for data driven models. To be cleanuped and re-evaluated in 1.8. Closes #773
2014-04-01 15:02:06 -07:00
Lex Manos
d9a1c718bf
Add position to BreakSpeed event. Closes #621
2014-04-01 15:00:25 -07:00
AbrarSyed
1d2d0ea5cd
fixed remaining noop patches and exc derp
2014-03-29 01:52:11 -05:00
AbrarSyed
0e1a1202d8
added .exe file.. fixed a bunch of patches
2014-03-29 01:12:45 -05:00
Lex Manos
ea2c07c727
-.- Both null combinations.
2014-03-10 23:41:37 -07:00
Lex Manos
1a9e13f880
properly implement equals, sod off Player.
2014-03-10 23:27:30 -07:00
Lex Manos
d97ec2763c
Implement simple hash based equals in Fluid ContainerKey.
2014-03-10 22:51:31 -07:00
Lex Manos
534b241e9f
Make StructureVillagePieces.Village public.
2014-03-10 22:12:46 -07:00
DemoXin
488eb30272
* Fixed Items.glowstone to Items.glowstone_dust
2014-02-28 02:54:50 -05:00
DemoXin
58fde290f8
* Added Ore Dictionary entries and recipe replacements for Diamond, Emerald, Crops, Redstone, and Glowstone
2014-02-27 22:48:33 -05:00
Lex Manos
246152d3c4
Fixed hashcode in FluidContainerRegistry, still needs a redesign. Closes #967
2014-02-23 16:56:29 -08:00
iChun
bad0639e90
Add cancelable RenderHandEvent.
2014-02-22 01:13:40 +08:00
Lex Manos
b43d63a7ad
Cull FakePlayers when worlds are unloaded.
2014-02-11 18:25:33 -08:00
Lex Manos
c8e0b4a193
Use correct tag types when reading Forced Chunk data. Fixes ticket loading. Closes #964
2014-02-10 16:16:03 -08:00
Lex Manos
c4972b7658
Fixed FluidContainerRegisry.contansFluid closes #845
2014-02-10 15:29:36 -08:00
Lex Manos
1e2c63f486
Add the beginnings of a Constants class, to document/clean some of the magic numbers that are in the MC code base.
2014-02-05 01:14:57 -08:00
Lex Manos
e68577ffd3
Updated FML:
...
MinecraftForge/FML@03fb1879d7 Fix obf error when right clicking a Empty Map.
MinecraftForge/FML@6bb9b8b953 Clean up FMLEventChannel. Closes #367 .
MinecraftForge/FML@b7b3450dcd Update MCP mapping snapshot to latest crowdsourced names.
MinecraftForge/FML@8c9e8b5270 Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it.
2014-02-05 01:14:24 -08:00
Christian
9d919f8ac9
Fix up the event handler so it knows it's owned by forge
2014-02-02 12:34:34 -05:00
Christian
67d9dac16d
Add a discriminator for fluididspacket. remove extraneous channel handler.
2014-02-02 12:19:37 -05:00
Lex Manos
51414375e4
Uncomment aa few FluidRegistry entries.
2014-01-29 21:04:34 -08:00
Lex Manos
2b9a2b5c1a
Inital Fluid system update, untested. Still in progress.
2014-01-29 18:34:23 -08:00
Lex Manos
6f7ac27c96
New PlayerUseItemEvents, Start, Stop, Tick and Finish. See PlayerUseItemEvent.java for more details. Closes #924
2014-01-24 19:10:51 -08:00
Lex Manos
796b53f549
Exclude cobblestone slab recipe from ore dictification, closes #940
2014-01-24 16:44:23 -08:00
Lex Manos
6c6f664c30
Implement PlayerPickupXpEvent, fired when a player aquires XP from a EntityXPOrb. Closes #942
2014-01-24 16:31:38 -08:00
Lex Manos
2e47771860
Missing EntityAITasks.tasks and MapgGenStructreIO register ATs, Closes #949
2014-01-24 16:04:41 -08:00
Lex Manos
75a80f2f75
Make ItemBlock.field_150939_a public, closes #945
2014-01-24 16:02:39 -08:00
Lex Manos
adf0e3ab7d
Add BookCloning to the recipe sorter.
2014-01-20 14:04:34 -08:00
Lex Manos
28f7f523ee
Add support in Techne models for the TextureSize tag. Closes #856
2014-01-18 13:53:54 -08:00
Lex Manos
baf95e747a
Fix warnings in Forge codebase.
2014-01-17 21:55:48 -08:00
Christian
eeeb4d37e8
Add exception logging to forge channel handlers as well
...
MinecraftForge/FML@53557dcd05 Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350
2014-01-17 17:05:11 -05:00
Ken 'Minalien' Murray
9e91b0ca81
Fixed MinecraftForgeClient for custom Item Renderer implementations. Removed check for forward-slashes (/) in texture asset locations (but left check for backslash in place).
2014-01-05 21:55:04 -07:00
Anton
9523059d85
Create ru_RU.lang
2014-01-04 09:28:29 +03:00
Christian
95c12b6c20
Updated FML:
...
MinecraftForge/FML@5317672631 Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses.
MinecraftForge/FML@9de9a15530 Fix stupid hardcoding derp
2014-01-03 23:07:55 -05:00
Lex Manos
b6199c202e
Fixed pipeline naming issue in the ForgeNetworkHandler.
2014-01-03 18:54:52 -08:00
LexManos
367c5d1ede
Merge pull request #882 from Vexatos/patch-2
...
Create de_DE.lang
2014-01-03 18:29:55 -08:00
Lex Manos
b149ccbc17
Models now load from resource packs
...
Models must now be loaded from resource packs using the standard resource pack reference. For example, to load a model named "assets/mymod/models/mymodel.obj", you would call AdvancedModelLoader.loadModel("mymod:models/mymodel.obj");
Closes #670
2014-01-03 17:10:15 -08:00
Vexatos
e6bfb6b7b3
Update de_DE.lang
2014-01-01 09:06:40 +01:00
Adubbz
bd5e7f8118
Fixed sky colour transitions on a render distance of 16, fixed the WorldGen of various things
2014-01-01 18:50:52 +11:00
LexManos
ccee30b15e
Merge pull request #908 from jk-5/patch-1
...
Add constructors to DimensionRegisterMessage
2013-12-31 13:08:56 -08:00
Lex Manos
b31fbe528a
Update for the FMLEmbeddedChannel change.
2013-12-31 12:48:59 -08:00
jk-5
03c4282ebf
Added default constructor for reflection
2013-12-31 08:21:05 +01:00
jk-5
5ff5f1b0d5
Added a constructor and made the fields package-private
2013-12-30 21:58:53 +01:00
jk-5
07fa6615f8
Update ForgeMessage.java
2013-12-30 20:12:15 +01:00
Christian
5c647d4515
Fix the network handler for forge
2013-12-28 17:01:58 -05:00
Christian
cf3447feea
Tidier implementation of previous commit. Should fix for subclasses of individual tools too
2013-12-27 21:48:42 -05:00
Christian
78b1b54e2b
Add in harvesting abilities of the items, should fix effectiveness
2013-12-27 21:26:42 -05:00
LexManos
46296328ff
Merge pull request #893 from iChun/master
...
Add render offset to event.
2013-12-25 01:05:45 -08:00
iChun
5f3ece629c
Add render offset to event.
2013-12-25 17:03:19 +08:00
Lex Manos
a6827f9820
Fix dig speed on redstone ore and obsidian.
2013-12-25 00:41:21 -08:00
Lex Manos
40d02fe6c3
Add a version check mechanic to startup, it is done in a seperate thread and has a config option to compleetly disable it. This allows us to notify users of new recomended builds. Hopefully stemming the flow of outdated help request. Also adds a warning to the main screen if you are running a 'Beta' Forge. Which means a Forge for a new version of Minecraft that we have not promoted a recomended build for yet.
2013-12-25 00:35:59 -08:00
Lex Manos
08a875c39a
Added constructor to WorldType, and delegated the BiomeLayer management to it. Also updated the access transformer for Item/Block classes.
2013-12-23 22:40:54 -08:00
Lex Manos
8ca1179e04
Move Grass {Flower} registry to BiomeGenBase as 1.7 made flowers Biome specifc, this means modders who wish to add global base flowers need to add them to all the biomes indavidually.
2013-12-23 20:34:39 -08:00
Lex Manos
2102965fac
Fix debug HUD rendering semi-transparently.
2013-12-23 20:32:37 -08:00
Lex Manos
436f7fc550
Bump version to 10.12.0 to mark 1.7.
2013-12-22 18:48:22 -08:00
Lex Manos
9ee5053b71
Fix:
...
Block placement/interaction
Tesselator crash due to wrong mapping
Missing isreplaceable check in world.canPlaceAt
Small foratting/logging cleanup
Temporarly commented out efficancy changes till I implement it.
2013-12-22 18:25:26 -08:00
Lex Manos
21e505c334
Forge uses the FORGE channel for packets.
2013-12-22 18:21:56 -08:00
bloodshot
8654623271
Refactored BiomeManager stronghold add/remove methods to support new
...
MapGenStronghold dynamic biome changes.
Changed InitNoiseGensEvent to pass a NoiseGenerator array instead of
NoiseGeneratorOctaves due to new NoiseGeneratorPerlin in
ChunkProviderGenerate.
Fixed worldgen crash caused by wrong metadata in Chunk patch.
2013-12-22 18:47:51 -05:00
Lex Manos
a6c45a7ade
Inital patch update for 1.7.2, Doesn't compile, not done yet.
2013-12-22 03:06:10 -08:00
Christian
ae478c92a2
Moved the core event handler parts to FML. Implemented the Forge network handler based on the new
...
netty strategy.
Updated FML:
MinecraftForge/FML@3b2994a3de Some patching touchups
MinecraftForge/FML@557357fe17 Update for log4j2
MinecraftForge/FML@a2b324beb2 Copy eventhandler from Forge into FML. It is going to replace a lot of the runtime event systems.
MinecraftForge/FML@4071ff38af Patch some GUIs. We're gonna add some basic mod gui config support.
MinecraftForge/FML@0b419ac79c Fire a user event down the channels when a handshake has occured.
2013-12-16 20:19:03 -05:00
Lex Manos
439dbd8bb3
Killed a few hundred compile errors.
2013-12-12 23:32:36 -08:00
Lex Manos
9cf0a5b68b
Comment out fluids until King gets his hands on it
2013-12-12 23:32:18 -08:00
Vexatos
ca7a404fc8
Create de_DE.lang
2013-12-11 15:17:20 +01:00
Lex Manos
521b8a16c4
Some work on 1.7, waiting for Abrar to fix a few things.
2013-12-09 21:59:12 -08:00
Lex Manos
d4e7a5c68e
Bump data for 1.7 start.
2013-12-09 18:47:55 -08:00
Lex Manos
b474c2ca7a
Kill liquids finally.
2013-12-09 18:47:15 -08:00
Lex Manos
e9af710cf4
Fix for new FML, and publish to maven local
2013-11-17 12:01:31 -08:00
AbrarSyed
74104fe5d0
Update forge
2013-11-17 12:07:22 -06:00
AbrarSyed
797399ff7f
Step 2: The Reformation
2013-11-09 15:57:08 -06:00