keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
7453 commits 1 branch 2 tags 103 MiB
Commit graph

2129 commits

Author SHA1 Message Date
ichttt
c98abaaa42 Fix some config checks still using the old fields (#6193) 2019-10-15 14:54:47 -07:00
Justin
a328364999 Fix mod info panel rendering incorrectly on some systems with HiDPI displays (pesky macs) (#6170) 2019-10-15 14:31:41 -07:00
FireController1847
94cbf72e39 Re-add PlayerGiveXpEvent & PlayerChangeLevelEvent (#6165) 2019-10-14 10:37:44 -07:00
Wyn Price
5978670897 Fixed IModelData not being cleared when tile entity is removed (#6115) 2019-10-10 23:07:52 -04:00
tterrag
940bbc4e91 Better sanity checks in ModelDataManager 2019-10-10 16:02:36 -04:00
Vincent Lee
7070bd0340 Make customClientFactory optional again (#6191) 2019-10-10 11:23:27 -07:00
David Quintana
5e9380ab85
Fix forge blockstates and custom model loading (#6154) 
* Reimplement forge blockstates variant through the use of a pseudo-model that handles the model loading, retexturing, custom data, etc. on behalf of the blockstates loader. This model gets injected into the model registry with an autogenerated unique name, to not collide with other model locations.
* Fix model loaders not being properly initialized by calling the reload method from the loader register function. In 1.12, registering a reload listener caused the listener to be called right away from the register method. This is not true anymore.
 2019-10-08 00:18:29 +02:00
cpw
9c759294c6
Add a super early GUI for showing pre-game launch messages from FML. NOTE: this cannot show on MAC because MAC can't handle 
off-thread GUIs in any way shape or form, and we need the main thread to do real work.

Fix forge fading in wrongly.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-05 17:03:02 -04:00
David Quintana
b294f4d894
New round of fluid system fixes: (#6175) 
- Fix race condition lazy-initializing flowing fluid block data.
- Fix typo in ItemTextureQuadConverter that prevents certain animated textures from being used in the fluid bucket.
- Fix calls to onContentsChanged in FluidTank.
- Fix FluidUtil.tryEmptyContainer logic when simulating.
- Fix EmptyFluidHandler.fill returning the wrong number.
 2019-10-05 19:49:26 +02:00
tterrag
ca980a56bc Combine all hidden mod resource packs into a single sortable pack 
Fix mod datapacks sorting under vanilla
 2019-10-04 18:36:33 -04:00
cpw
8482293b40
Split server and client side pack locators apart and move them to their 
respective behavioural components. This should facilitate fixing the
server pack data pack ordering, as well as other new features of mod
resource packs.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-04 15:24:15 -04:00
LexManos
dc5a06aab4 Fix dimension types being incorrect when connecting to a non-Forge server. Closes #6203 2019-10-04 10:36:50 -07:00
cpw
35bd69808c
Fix the stupid derp that broke singleplayer dims. Don't send the dim packet 
to the local client - it is not needed because obviously not. Seems to have
fixed the problem. Probably infinity new bugs by this.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-04 07:27:11 -04:00
tterrag
4f12261080 Move OnlyIn patches on DyeColor to SAS file 
Also fix broken cobblestone stairs recipe
 2019-10-04 02:26:54 -04:00
cpw
48735c3946
Properly propagate the DimensionType information from server to client 
at client connection time. This means the client now knows about the
dimensiontype properly and can access the ModDimension information on
the client.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-10-02 21:54:02 -04:00
Ruben Taelman
c985225d0c Fix FluidTank with empty contents throwing error if drained (#6196) 2019-10-01 19:57:05 -07:00
tterrag
b3631b707c Make patched-in StairsBlock constructor public 
Also fix supplier generic being too narrow in DeferredRegister#register
 2019-09-27 17:56:30 -04:00
tterrag
476b7056fb Usability improvements to RegistryObject/DeferredRegister 2019-09-25 18:01:39 -04:00
tterrag
01a862db30 Fix sea level not being available on client, move hook to Dimension 2019-09-23 13:08:26 -04:00
tterrag
571ecafdbc Fix type bound on GameRegistry.findRegistry being too narrow 2019-09-21 16:19:23 -04:00
tterrag
dee844e232 Add IExtensibleEnum#init, extend FillerBlockType/PlacementBehaviour 2019-09-21 15:57:32 -04:00
cpw
07bcff5067
Tag the deprecation of DeferredWorkQueue. I think this is causing confusion 
as to scope. Its functionality will be tied to the events in future -
so mods can request the deferred work through methods on the Mod Lifecycle
events directly. The API will be coming soon.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-17 21:41:08 -04:00
cpw
7fa3594c04
Fixed the problem where an error would cause the main thread to continue 
even though there were still parallel threads running. Also, handle exceptions
in the AutomaticEventSubscriber rather than leaking them to the Parallel processor.

Actually closes #6148
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-17 21:41:08 -04:00
Brennan Ward
af8074cc39 Post tag event directly from reloader thread (#6164) 2019-09-17 14:39:36 -07:00
cpw
71a4828809
Some tweaks around the code base. A functional consumer for networking - return a bool from your consumer function, rather than setPacketHandled. 
Tweak the server modloading behaviour to try and be a bit clearer that a mod errored.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-16 20:14:25 -04:00
Brennan Ward
79ce18ac3e Update furnace fuels to not recreate it's list every query, and update when tags are reloaded. Add Tag update events. (#6140) 2019-09-16 14:04:32 -07:00
Nightenom
bb83e11a7c Maintain default behavior for Item#canPlayerBreakBlockWhileHolding() (#6128) 2019-09-16 13:36:43 -07:00
MrCrayfish
f4215d121c Reimplemented "MouseEvent" as RawMouseEvent for 1.14.X (#6144) 2019-09-16 13:03:10 -07:00
LexManos
3cc76a3f60 Fix Entity.getPersistentData function name. Closes #6131 
Bump spec version for first 1.14.4 RB.
 2019-09-12 09:12:30 -07:00
David Quintana
58335d7bc0
Minor fixes to the fluids (#6150) 
* Fixed vanilla rendering of fluids to take into account the alpha bits of the color, and fix usages accordingly.
* Fixed missing texture derp.
 2019-09-12 17:33:19 +02:00
David Quintana
b0c9d7cce9
Some (sadly breaking) improvements to the Fluid API (#6110) 
* Some (sadly breaking) improvements to the API, after feedback and concerns provided by users:
  - Moved calculation of the translation key to the FluidAttributes constructor, so that builders can be shared between still & flowing sub-fluids.
  - Moved biome-based coloring to a dedicated FluidAttributes.Water variant, which is not used by default.
  - Added logic to automatically gather fluid textures into the list of textures to bake.
  - Patched BucketItem and FlowingFluidBlock to avoid eager access to the fluid objects.
  - Added a ForgeFlowingFluid class, as a more user-friendly way to construct a new FlowingFluid.
 2019-09-11 16:00:32 +02:00
LexManos
281ef5a152 Add new DeferredRegistry helper, and change RegistryObject to update when overrides are registered. 2019-09-10 16:02:07 -07:00
tterrag
f777aba227 Remove StructureArgument to work around vanilla issue, clean up custom arguments 2019-09-08 02:01:17 -04:00
tterrag
fc5573333d Make /locate command support modded structures 2019-09-07 01:09:42 -04:00
tterrag
55fe7c470f Make STRUCTURE_FEATURE registry a slave map of the FEATURE registry 
Also convert Feature.STRUCTURES to a slave map
 2019-09-06 23:42:19 -04:00
LexManos
3ef1d6919c Fix REGISTER packet encode/decode issues. 
Changed ForgeConfig values to return the default value if the config is not loaded, and exposed the value objects as a internal config.
 2019-09-05 15:38:14 -07:00
LexManos
e1863383ff Fix naming conflicts with official names. 2019-09-04 22:33:17 -07:00
LexManos
4dc34b7d5b Fix item used stat not triggering properly on last item in the stack. 2019-09-03 19:58:57 -07:00
LexManos
2c8c022034 Add a bunch of tags from the omnibus. 
Fix test imports. And update patches for line numbers.
 2019-09-03 18:51:09 -07:00
bl4ckscor3
b5b43a5a36 Add spawn reason to spawn events (#6096) 2019-09-03 15:15:48 -07:00
Wire Segal
c09fe57031 Add collisionExtendsVertically hook to allow modded blocks that extend collision into the block above similar to fences. (#6092) 2019-09-03 14:50:27 -07:00
ichttt
ddb90a69d3 Fix CME on chunk unload in FarmlandTicketManager (#5998) 2019-09-03 12:59:35 -07:00
cpw
bdce8d0494
Add a modfolderfactory. Fix up login payload exposure. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-09-01 14:40:39 -04:00
cpw
a4aa85259e
Add in some client only player connectivity events. Closes #5536 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:46 -04:00
cpw
ea1c7a7339
Add in MC REGISTER nonsense. Shut up #5730 
Tweak network a bit to fix initialization order stupidity. (Constants don't
load classes!)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:46 -04:00
GirafiStudios
26e4bf92a0
Added getters for FMLPlayMessages.SpawnEntity 2019-08-31 13:55:46 -04:00
cpw
68cb017be1
Move indexFor and biConsumer into FMLHandshakeHandler and expose them publicly, so mods can add additional 
login messages. Closes #6087

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-31 13:55:45 -04:00
David Quintana
68ff1afac1
Hookup BlockEvent.FluidPlaceBlockEvent (#6103) 2019-08-31 14:15:08 +02:00
David Quintana
d9f6659f2c
Fluid rework derp fixes. (#6098) 
* Fix nulls returning from non-null methods, and null-check of non-nullable values.
* Fix missed computation of the isEmpty flag in FluidStack
* Cleanup getAmount/isEmpty calls.
* Remove redundant suppliers. That info is readily available from the vanilla Fluid / FluidState.
 2019-08-29 21:09:42 +02:00
Vincent Lee
bae2ee0420 Minor model system cleanup/documentation (#6089) 2019-08-28 21:33:49 -07:00
ichttt
06c3e255b3 Add a config comment that lists the available constants of enums (#6079) 2019-08-28 21:28:21 -07:00
Daniël Goossens
c83d4d29e4 Added new InputEvent.MouseScrollEvent, fixes #5811 (#6037) 2019-08-28 21:13:31 -07:00
Brennan Ward
ee1c06085b Add Villager Trading Events (#6016) 2019-08-28 20:34:07 -07:00
Wyn Price
95c58ba75c Updated constants to 1.14 (#6012) 2019-08-28 20:13:47 -07:00
Vincent Lee
838998b885 Add particle factory registration event (#6018) 2019-08-28 18:42:17 -07:00
David Quintana
a9b3b48273 Make FluidStacks non-nullable, and implement some TODOs. 2019-08-29 03:18:42 +02:00
David Quintana
b7e1cc5f6b Fluid API rework (#5983) 
- Moved forge fluids into FluidAttributes companion object to the vanilla Fluid. By gigaherz
- Redesigned the Fluid API to be closer to the Items API. By King Lemming
Co-authored-by: King Lemming <kinglemming@gmail.com>
 2019-08-29 03:18:41 +02:00
LexManos
e784a7f606 Recipe system cleanup. (#6014) 2019-08-29 03:18:41 +02:00
LexManos
7deb479676 Fix blocks being placed in adventure mode. Closes #6085 
Add early error for setting invalid world directory. Closes #6084
Fix PlayerTickEvent not firing when dead, even if player isn't removed from world yet. Closes #6074
Fix PlayerDestroyItemEvent not firing for some cases. Closes #6067
 2019-08-28 12:57:25 -07:00
LexManos
1ab40e0b3f Fix Javac generics breakage. 2019-08-20 15:40:36 -07:00
LexManos
283c3d1664 Prevent worlds from unloading while players are in out-of-world states by tracking all worlds references by every player in the server's player list. 2019-08-20 15:31:08 -07:00
LexManos
5291ea7270 Add Argument serializer for ModIdArgument. EnumArgument can't as vanilla doesn't support extra data. 2019-08-20 15:29:26 -07:00
LexManos
0c1c1b65e1 Sort server.properties while writing. 2019-08-20 15:27:31 -07:00
LexManos
dc0eacb80f Fix Configs not generating correctly on first load Closes #6069 2019-08-19 19:45:32 -07:00
Vincent Lee
8c04651301 Add hook to load custom mrls/rls not attached to a block or item. (#6010) 2019-08-15 11:03:57 -07:00
kirderf1
5e392e3300 Make DimensionManager.SavedEntry save sky light consistently (#6019) 2019-08-15 10:17:28 -07:00
cpw
4323c6d845
Grrr. Stupid error. Sorry lex: I fixed it. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-05 08:56:42 -04:00
cpw
81ec8b99ac
Actually reload config when it changes on disk. Closes #5541 and #5959 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:37:43 -04:00
cpw
1af7b7603d
Move fml's PlayerEvent and TickEvent to forge. Update 
`import net.minecraftforge.fml.common.gameevent.PlayerEvent;`
to
`import net.minecraftforge.event.entity.player.PlayerEvent;`
and
`import net.minecraftforge.fml.common.gameevent.TickEvent;`
to
`import net.minecraftforge.event.TickEvent;`

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:34:14 -04:00
cpw
0fd8fa2211
Bump modlauncher to 3.2.x. Add a sender modid and document IMC. Closes #5746 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 22:19:02 -04:00
cpw
5048739b7f
Turned minecraft into a proper Mod, with a "dummy" language provider. 
Also fixed the "translations" not being available early if an exception occurs
by force loading the forge and MC ones. Closes #5984

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-08-04 20:16:01 -04:00
DaemonUmbra
44f3f9e2d0 Fix a crash I caused by misunderstanding formatToString (#6007) 2019-08-02 18:48:46 -07:00
its_meow
50e411b82a Add piston events (#5798) 2019-08-02 14:12:21 -07:00
JoJoModding
c7940e70ed Add button to open mods folder (#5986) 2019-08-02 14:00:54 -07:00
DaemonUmbra
58ede2c80a Change ModLoadingException to display ModID instead of ModInfo instance identifier. (#5999) 2019-08-02 13:44:56 -07:00
Gamebuster
9a50c208f0 Fixed Buttons in the error screen are incorrectly rendered if they are extremely long Closes #5687 (#5924) 2019-08-02 13:42:58 -07:00
Gamebuster
7acb380ba8 Fix LazyOptional throwing NPE to consumers when owners null. (#5772) 2019-08-02 13:42:13 -07:00
LexManos
48fa2f458c Make Villager profession unlocalized name use modids when not 'minecraft' Closes #5977 
Fixed trees able to be generated through water. Closes #6000
Change Block#toString to use getRegistryName instead of getNameForObject Closes #5937
Allow Cooking Recipes to deserialize results with stack sizes. Closes #5960
 2019-08-02 13:37:02 -07:00
LexManos
318fc6ffe8 Fixed DimensionType.getRegistryName() returning null Closes #5992 
Fixed RegisterDimensionEvent not firing for new worlds. Closes #5987
 2019-07-31 22:43:46 -07:00
ichttt
c6dd475610 Move world unload patch to tick function to prevent duplicate unloading, fix log message in dim manager, fix javadoc for unload method (#5964) 2019-07-30 16:39:05 -07:00
cpw
ae09fc6b6d
Register a config command. Currently one subcommand: showfile, which 
when passed a modid and a type (CLIENT, COMMON or SERVER) will display
a link in the caller's chat to open that file in the OS file viewer of choice.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-28 21:09:15 -04:00
cpw
cd826f7bcf
Load default configs from the defaultconfig directory by default. (Can 
be overridden in the fml.toml config file if desired).

Will load any type of config tracked file from there - client, common, server
or custom tracked file. This means you can ship defaults for your pack
in a defaultconfig directory. I am thinking about ways to force a specific
config override for an existing config.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-28 13:44:18 -04:00
LexManos
1918148b8e Fixed network ticking player entity while it is dead. And explicitly prevent overworld from unloading. Closes #5978 2019-07-27 02:35:06 -07:00
cpw
e17714583f
Crash report extended to show ModLauncher FML and Forge data. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-26 20:02:21 -04:00
LexManos
731e1920d2 Fix @ObjectHolderRegistry not properly detecting vanilla class level references. Closes #5958 2019-07-25 17:59:08 -07:00
David Quintana
ae3d002ac6 Fix & Improve state comparison when checking vanilla block replacements (#5922) 2019-07-22 19:23:20 -07:00
cpw
c90b1732e9
Fix objloader registering at wrong time. Closes #5847. Added test 
class as suggested in the issue.

Note: most tests are commented out at the present time, pending
rework. Tests that work, work.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 21:04:00 -04:00
cpw
186d91c03f
Merge branch 'pull/5948' into 1.14.x 2019-07-20 19:35:26 -04:00
cpw
4582a29ec1
Make I18N format errors less spammy, also remove single apostrophes from 
current translations in en_us.json. Other langs may still have problems.

Closes #5952
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-20 19:14:17 -04:00
cpw
27afdc8a27
Provisional update to 1.14.4. Missing a lot of playerinteractionmanager patches because everything moved and I'm tired. 
Fix up immediate problems.

bump to 28.
 2019-07-20 00:35:40 -04:00
cpw
eff42f6066
Update mappings to 20190719 in prep for 1.14.4.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-07-19 11:55:30 -04:00
Barteks2x
b99453d568 Fix RegistryObject when used with generic registry entry classes 2019-07-19 12:06:16 +02:00
LexManos
cb21e95e0b Change default BrewingRecipe to use an Ingredient for the input instead of ItemStack. Closes #5944 
Add AT for GameRules.register Closes #5946
Fix Forge Blockstate loader model path is inconsistent with vanilla blockstates Closes #5892
Fix client crashing when opting not to load a world when there's missing blocks Closes #5886
 2019-07-18 14:13:20 -07:00
its_meow
5cf2af569f [1.14.x] Fix text positioning issues caused by scaling loading screen (#5932) 2019-07-16 12:41:21 -07:00
LexManos
a46b7cb67a Fixed PlayerSleepInBedEvent pos is always null Closes #5936 
Fixed decompile error causing Endless Loop in ModelBackery if model errors exist.
Fixed NPEs related to teleporting players without portals.
 2019-07-16 11:52:51 -07:00
LexManos
3d78f30d18 Add simple concurrency protection to Server world list. Closes #5938 and #5739 2019-07-16 09:59:33 -07:00
tterrag1098
0a7f5ff9fa Rework GuiModList mod info to use custom scrolling panel impl 2019-07-10 20:13:33 -07:00
LexManos
2cc264645b Implement Item.isRepairable in Crafting and Grindstone. Closes #5917 2019-07-09 18:02:47 -07:00
LexManos
983e0a93db Re-implement state.onBlockExploded() Closes #5914 2019-07-09 17:07:09 -07:00
Vincent Lee
d88e4fbf36 Add general damage hook for items. Closes #5502 (#5670) 2019-07-08 20:43:02 -07:00
LexManos
f79da3edf7 Fix syntax error in IRenderHandler. 2019-07-08 20:14:41 -07:00
LexManos
8742d74e93 Pass tick counter to custom render handlers (#5744) 2019-07-08 19:55:47 -07:00
Cadiboo
ff80ab6a23 Fire Loading event (#5795) 2019-07-08 19:49:47 -07:00
ichttt
06a30e9f23 Adds some explanatory javadocs and check world in ModelDataManager (#5762) 2019-07-08 19:47:18 -07:00
Antoine Lucas
650e7dc16e Add InputEvent documentation (#5698) 2019-07-08 19:47:06 -07:00
ichttt
d41fad51c2 Add IModelData to getParticleTexture (#5756) 2019-07-08 19:46:32 -07:00
ichttt
0463949ac3 Fixed BakedModelWrapper not delegating new methods (#5761) 2019-07-08 19:45:27 -07:00
Sargun Vohra
5f0fd4b706 Throw exception when a mod returns null from a dispatched capability provider (#5646) 2019-07-08 19:45:10 -07:00
Benjamin K
201c368325 Add isServer and isClient methods to LogicalSide (#5606) 
* Add helper methods to LogicalSide.

* Fix backwards docs.
 2019-07-08 19:44:35 -07:00
Cadiboo
3fe08f149d Added documentation to ObfuscationReflectionHelper adn deprecated index based functions. (#5893) 2019-07-08 19:44:21 -07:00
LexManos
61bea2bfda Fixed EntityJoinWorldEvent not being fired when player is added to ServerWorld. #5827 
Fixed wrong example path for the access transformer in the MDK build.gradle. #5891
Added getters for mouse x/y velocity and if the middle-mouse button is being held down. #5776
Modify issue template for better clarity. #5874
Fixed grindstone not using ItemStack-sensitive getMaxDamage. #5831
Added ParticleManager.registerFactory to Forge's AT. #5896
Fixed NPE in SidedInvWrapper when side was null. #5787
Moved EndermanEntity.setAttackTarget super call to allow LivingSetAttackTargetEvent the ability to override default behavior. #5778
Added field to make "Looking at" debug info maximum distance configurable #5714
 2019-07-08 18:42:12 -07:00
DaemonUmbra
f720140481 Disable Config Button when no mods are selected (#5905) 
Closes #5889
 2019-07-08 15:56:49 -07:00
Tedstar
66a2d38ab8 Fix MC-258 on mod list screen, enable sorting, minor tweaks. (#5846) 2019-07-08 15:50:05 -07:00
Cloudhunter
719f08ea5e Fix link applying to whole component in chat if component starts with link (#5909) 2019-07-08 15:46:49 -07:00
primetoxinz
765efc3c72 Update TextureStitchEvent.Pre to give access to the list of ResourceLocations that will be loaded as textures. (#5870) 2019-07-03 12:26:51 -07:00
LexManos
358211ca66 Fix type cast issues in ForgeConfig values. Closes #5894 
Added config value set and save functions.
By default mod configs are auto-saved, so you do not need to call save unless you create your own Config object.
 2019-07-02 11:54:59 -07:00
cpw
c8e5007913
Remove legacy StartupProgress. 
Implement properly scalable progress thanks to @gigaherz. Closes #5863.
Implement API for pushing messages to the startup screen from mods.
Add memory display.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-30 23:48:54 -04:00
LexManos
13ae8e41ee Fix duplicate WorldEvent.Unload call in client key handler. 
Add recipe generator to replace vanilla recipes with Forge tags.
 2019-06-27 17:23:23 -07:00
ある
2c3183bdae Fix garbled "µs" (#5818) 2019-06-26 13:23:47 -07:00
tterrag
e81c330694 Fix configs correcting numeric values when the primitive type differs 
Fix configs with range not clamping the corrected value, and instead
just replacing with the default

Closes #5855
 2019-06-25 19:56:31 -04:00
Ben Staddon
790da699dd Fix item placement losing NBT data in creative mode (#5757) 2019-06-25 13:59:10 -07:00
MajorTuvok
7915397377 Add extension to write entry id's to PacketBuffer's (#5812) 2019-06-25 13:55:24 -07:00
Someone
b2a5d34679 Add isItemValid check for ItemStackHandler (#5850) 2019-06-25 13:50:08 -07:00
Tedstar
9701148819 [1.14.x] Replace dye items in Forge tags. (#5843) 2019-06-25 13:44:54 -07:00
bl4ckscor3
b8131e6e67 implement Ingredient.getSerializer for custom ingredients (#5813) 2019-06-25 10:25:33 -07:00
LexManos
f4598a97f7 Fix vines and scaffolding not being climbable. 
Fix powered rails not spreading power correctly. Closes: #5854
 2019-06-24 20:05:50 -07:00
LexManos
ff0bb8c83c Initial 1.14.3 update. 2019-06-24 19:01:03 -07:00
cpw
e5acea60e6
Fix too many registries being sent from server to client 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 19:54:55 -04:00
cpw
0a819da0e7
Reorganize sided event dispatch slightly. Dispatch model and entityrenderer 
functions at more appropriate times.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 16:01:20 -04:00
cpw
60513446fa
Merge branch 'pull/5793' into 1.14.x 2019-06-23 14:42:32 -04:00
cpw
be415091cd
Fix crash when crashing during modloading. Fix GuiModList being weird. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 14:37:05 -04:00
cpw
9067dbf6a0
Process the main modloading work on the async thread, but still 
do deferred work on the main thread by passing in the executor.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-23 12:26:45 -04:00
tterrag
359be1a880 Clean up config comments, make comment array nonnull 2019-06-23 02:57:00 -04:00
tterrag
99624bf3b5 Fix forge event bus never starting up 2019-06-23 02:17:51 -04:00
tterrag
252b94a110 Automatically add range to config comments 2019-06-23 02:17:28 -04:00
cpw
448d996a45
First pass of adding text to the loading progress UI. It deliberately uses the very primitive STB 
generated font, so can only render basic ASCII text, and also only renders pre-defined strings,
as translations aren't available either.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 23:39:00 -04:00
JoJoDeveloping
b9e5dfd286
Add mod failure identification 2019-06-23 03:14:05 +02:00
cpw
d966746fbf
Moved some events to the Mod's event bus. You'll need to update which bus 
you're listening to for these. (The Mod event bus is the only one actively
dispatching events during model loading).

ModelRegistryEvent, ModelBakeEvent, TextureStitchEvent.Pre, TextureStitchEvent.Post, ColourHandlerEvent.Block, ColourHandlerEvent.Item

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 20:36:07 -04:00
cpw
89006458a2
Fix stupid bug introduced with the refactor.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 19:08:49 -04:00
cpw
389bc1ecea
Tidy up mod loading a bit more, and also crash if the [[mods]] list isn't 
a list.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 12:52:22 -04:00
cpw
256bd01e0c
Fix server side loading, tweak mods command. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-22 12:31:27 -04:00
cpw
83a0dc2ef9
Merge remote-tracking branch 'origin/1.14.x' into 1.14.x 2019-06-21 22:42:33 -04:00
cpw
c10174d50d
Update mappings, move mod initialization to the async loader. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-21 22:42:16 -04:00
tterrag
5a3b375147 Fix #5612 add entity to ISelectionContext 2019-06-21 21:15:56 -04:00
tterrag
656ff25ae1 Fix #5768 add access to MainWindow object in RenderGameOverlayEvent 2019-06-21 20:29:04 -04:00
tterrag
5fb948fb35 Fix #5805 ModelBakeEvent does not fire 2019-06-21 19:34:58 -04:00
LexManos
a14c2233e0 Fix lighting not being sent to client when large amounts of blocks change at once. Closes #5839 
Remove RecipeType/VanillaRecipeTypes, as 1.14 has a vanilla system for this.
 2019-06-19 18:10:02 -07:00
LexManos
0a8a601877 Add temporary hard crash when mods error until we can load our error screen. 2019-06-16 00:48:38 -07:00
LexManos
002e29958e Make ReverseTagWrapper unmodifiable, fix error in log when mods folder doesn't exist initial scan. 2019-06-16 00:47:40 -07:00
cpw
604987a005
Skip running the datagenerator on unrequested mods. 
Add a run config for the data task for modders to use

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-16 00:47:50 -04:00
cpw
7e3e6b1969
Remove paulscode hack. It is not needed in 1.14, since paulscode is 
no longer used.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-15 21:51:51 -04:00
cpw
d821514372
Modify lex's data handler to use proper mod lifecycle event mechanisms 
instead. New Lifecycle Event for requesting data harvesting. Mods will
be constructed, the registry will fire, and then a new Data event will
fire. Submit new data tag files to the data gatherer if you wish.
The game will shutdown after this. No other mod elements will happen.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-15 21:24:45 -04:00
cpw
37a896fe1b
Add params for the exception message 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>

tweak logging

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-15 19:47:08 -04:00
LexManos
e1cdb2e558 Expose the data entry point and generate Forge's Tags using it. 2019-06-13 20:58:03 -07:00
LexManos
c30b27fcfe Add reverse tag cache, to make looking up tags for items/blocks/etc.. less costly. 2019-06-12 19:28:10 -07:00
Johannes
ed3dc8c7d3 Implement getValue in ClearableRegistry fixing DimensionArgument. (#5809) 
Fix DimensionArgument
 2019-06-12 16:16:32 -07:00
kashike
4bd7427b70 Use dragon_immune block tag instead of manually checking blocks (#5792) 2019-06-12 01:04:13 -04:00
tterrag
d5ee80a70a Add IContainerFactory for reading custom container data on the client 2019-06-10 18:14:49 -04:00
tterrag
da22fd40bf Adjust NetworkEvent#enqueueWork to match vanilla logic 
In singleplayer our packet work could get delayed until the next tick,
breaking the expectation of packet read order. Fixes that using
NetworkHooks.openGui would result in missing inventory data on the client
 2019-06-10 00:13:27 -04:00
tterrag
3385e62aa7 Add forge registries for most vanilla registries 
Made all registry names consistent with their vanilla counterparts
Also added a system for legacy registry names, so no data will be lost
Cleaned up formatting in GameData and ForgeRegistries
 2019-06-09 04:23:39 -04:00
tterrag
40f2276e88 Add registry flag for syncing 2019-06-09 00:55:42 -04:00
tterrag
892fea3df9 Add forge registry for container types, expose ScreenManager.registerFactory 2019-06-09 00:19:17 -04:00
cpw
2d32929dc5
Don't NPE during construction of ModLoadingException.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-08 14:30:15 -04:00
LexManos
728b4857c3 Fix misobfed methods due to mapping conflict. 2019-06-08 09:22:03 -07:00
cpw
9fa4641cb0
Update mappings 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-06-08 10:45:28 -04:00
tterrag
a93d7d20ee Rework model patches/classes for new bake signature 2019-06-08 01:02:29 -04:00
LexManos
b74b72e44c Fix NamespacedWrapper not delegating a new getter. Fixing data loading spam at world start. 
Update red/yellow/green tags with new vanilla item names.
Reenabled test source directory in project and made ModelDataTest compile.
 2019-06-07 19:34:16 -07:00
LexManos
a7df63e1a1
Update to 1.14.2 2019-06-07 16:50:47 -04:00
LexManos
d3e8804dbf Include new library in installer json. 
Change order of versions on main menu, to prevent overlap with default window size.
Fix Forge update not displaying version info.
 2019-05-27 19:13:55 -07:00
LexManos
4b5bf760ec Fix tall grass not dropping seeds. Closes #5675 2019-05-27 13:46:19 -07:00
cpw
c57c6213ea
Enhance crash reports and logging to capture transformers on stack trace elements. 
Moved log4j2.xml file to the launcher source set, so it loads first in the client.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-05-27 00:00:45 -04:00
tterrag
fb30820e2b Remove cache eviction for model data, optimize 2019-05-23 21:49:39 -04:00
Philipp
61b612c88a dimesnion -> dimension typos (#5684) 2019-05-21 15:43:45 -04:00
ben-mkiv
d3edc9dcdc FENCES_NETHER_BRRICK => FENCES_NETHER_BRICK (#5681) 2019-05-21 15:43:45 -04:00
Hugman
ba2485b807 GEMS_QUARRTZ -> GEMS_QUARTZ (#5635) 2019-05-21 15:43:45 -04:00
Cadiboo
60c6635af5 Small comment typo fixes for ObfuscationReflectionHelper (#5583) 2019-05-21 15:43:45 -04:00
LexManos
eae0858de6 Fix build script producing duplicated eclipse source folders. 
Fix not including userdev source in sources jar.
Update license header of files that need it.
Delete patches_old folders. Most are unneeded in 1.13+ as the systems they effected were changed significantly. Any that need to be readdressed can be done as PRs.
 2019-05-13 19:11:24 -07:00
cpw
5cd82f16f2
Fix #5735 by pushing new build. Shutdown Forge eventbus when errors occur. Closes #5711 
Also, improve logging so warnings, errors and fatals are always shown, regardless of marker.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-05-12 13:07:29 -04:00
cpw
6a1337aa92
Updated a couple of libraries. Fixed bug where modid could be in toml but 
not found during loading, yet game continued to load.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-05-11 20:47:42 -04:00
tterrag
9209c3cbfe
Add new system for model data, replacing extended states (#5564) 2019-05-09 02:10:38 -04:00
LexManos
a7204b5cd3 Bump ForgeSPI version, and add support for DistCleaner stripping interfaces from classes. 
Add more detail to VersionChecker log info.
 2019-05-06 15:52:12 -07:00
tterrag
416bf9e3bf Allow loading json constants outside of _constants 2019-04-25 19:22:43 -04:00
Ben Staddon
1fcfd54584 Fix some vertex format changes not being handled correctly (#5368) 2019-04-25 18:31:17 -04:00
Ben Staddon
441a9c9024 Transform vertex normals as well as positions when generating quads (#5242) 2019-04-25 18:29:12 -04:00
Robert WC Seifert
f68fdcf703 Fix for SidedInvWrapper isItemValid using wrong slot (#5642) 2019-04-25 18:20:42 -04:00
ichttt
1aae18d4bc Minor performace improvement when building chunks and rendering blocks (#5286) 2019-04-24 13:20:19 -04:00
Ben Staddon
45902676fd Catch json parsing errors from constants/factories files (#5258) 2019-04-24 13:12:03 -04:00
Ben Staddon
931105123e Allow custom DataSerializers to be registered safely (#5245) 2019-04-24 13:05:12 -04:00
tterrag
cf35019d07 Further clean up Constants, and add two new BlockFlags 2019-04-24 12:58:09 -04:00
tterrag
d6da893c0c Update Constants for 1.13 2019-04-24 01:26:24 -04:00
Wyn Price
47a7d8e2b7 Added more Constants (#5323) 2019-04-24 01:25:21 -04:00
Thanh-Phuong
cb0cf2f04f Add a few events pertaining to villages (#5302) 2019-04-24 01:07:02 -04:00
tterrag
a4cf5951ca Sync up canPlaceTorchOnTop logic with BlockTorch#isValidPosition 2019-04-24 00:59:03 -04:00
Ben Staddon
eed92ba07c Only prompt for missing registries on local worlds (#5348) 2019-04-23 20:45:48 -04:00
tterrag
a86317efc8 Reimplement ForgeHooks#onPlaceItemIntoWorld and remove old place events 2019-04-23 20:42:08 -04:00
Christopher Krier
ca973f053f Add EntityPlaceEvent (#5057) 
Co-authored-by: tterrag <tterrag1098@gmail.com>
 2019-04-23 19:58:09 -04:00
Ben Staddon
119e4a6924 Fix small logic error in ItemTextureQuadConverter (#5463) 2019-04-23 19:03:43 -04:00
Ben Staddon
18d0f7ba0d Fix up torch placement logic to handle more vanilla special-casing (#5426) 2019-04-23 17:39:50 -04:00
tterrag
e70cc4fcae Simplify custom item rendering by removing GL emissivity hacks 2019-04-23 15:23:12 -04:00
tterrag
d02da21a7a Support diffuse lighting flag in item rendering 2019-04-23 15:21:01 -04:00
Ben Staddon
817546e4c8 Add a hook to allow continuously using items through stack changes (#4834) 2019-04-23 15:12:55 -04:00
Ben Staddon
501f1dc8dc Fix small logic error in emissive item rendering code (#5320) 2019-04-23 12:37:32 -04:00
Ben Staddon
8b5a5ecd74 Ensure slave maps are cleaned up when handling registry overrides (#5250) 2019-04-23 12:31:55 -04:00
tterrag
cb3ff19801 Remove hack to force enum configs to strings 2019-04-18 22:13:19 -04:00
tterrag
f30d7bc845 Fix #5688 config values are unordered, update Night-Config 2019-04-18 22:13:13 -04:00
ichttt
c0aa4c8517 Cleanup/Implement some todos (#5660) 2019-04-17 13:57:32 -07:00
Lars Gerrits
273b1b110a Add GuiContainerEvent.DrawBackground event. (#5595) 2019-04-15 18:56:58 -07:00
0uti
bbc92fa51c [1.13.x] Fire InputEvents (#5533) 2019-04-15 18:50:18 -07:00
tterrag
8515b9dd10 Fix compile error in FakePlayer from cherry pick 2019-04-13 21:42:42 -04:00
LexManos
592b957b77 Fix potential issues with the Minecraft FakePlayer lingering around after world unloads. 2019-04-13 11:17:27 -04:00
tterrag
65cfef1b2e Fix potion remove event not always firing, add expiry event 2019-04-13 11:17:00 -04:00
mcenderdragon
914fe91db5 added PotionHooks, closes #3867, #4375 (#4614) 2019-04-13 11:03:58 -04:00
ichttt
a67cce2f91 Add a hook for farmland watering (#4891) 2019-04-12 20:16:34 -04:00
tterrag
abf010ac48 Fix #5659 setdimension command entity filtering, avoid inverting logic 2019-04-12 19:43:41 -04:00
Ben Staddon
2baa05ace9 Improve support for custom block path types (#5203) 
Co-authored-by: tterrag <tterrag1098@gmail.com>
 2019-04-12 13:47:48 -04:00
Ben Staddon
fa708f93ee Allow items to control the rate of repair from mending (#5102) 2019-04-12 13:26:15 -04:00
MrRiegel
d20b1f271e Fix an ObjectHolderRef internal error message (#5214) 2019-04-12 10:49:26 -04:00
tterrag
67da3182c1 Implement rendering for item models with emissive quads (#5047) 2019-04-12 10:45:32 -04:00
Paul Fulham
1280dea111 Fix inaccurate main thread name shown in client log (#5078) 2019-04-12 10:23:08 -04:00
Ben Staddon
3920b7aaa3 Fix Baked Item models with transformations (#5241) 2019-04-12 10:11:15 -04:00
Ben Staddon
3f70fd49ff Fix missing string parameters in some log messages (#5210) 2019-04-11 18:57:37 -04:00
Ben Staddon
7496e3dbdf Re-add some missing villager profession patches (#5200) 
* Fix zombie villagers only spawning with vanilla professions
* Fix spawning modded villagers that do not have their own building
 2019-04-11 18:50:01 -04:00
Ben Staddon
a02bec7ebe Fix some null returns from defaulted registries (#5235) 2019-04-11 18:05:26 -04:00
gaudus
7d2c8fa6ef fixed visual bug with guislider 2019-04-11 17:38:01 -04:00
Ben Staddon
ac210a3201 Make Forge blockstate variants correctly inherit AO setting from vanilla models (#5190) 2019-04-11 17:35:01 -04:00
Ben Staddon
a79975b3ea Make Forge-provided default transforms accessible to custom models 2019-04-11 17:32:31 -04:00
cpw
aa7380acc6
Actually parse the i18n exception message into the super constructor, 
so the exception has a useful text message, even in crash logs and
on the server.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-04-06 14:22:24 -04:00
cpw
cdbd842494
Refactor to use naming service, and provide an MCP naming service when 
in userdev. Step 1 to supporting loading SRG mods in userdev.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-04-06 12:10:54 -04:00
cpw
3f735b715b
Implement API for mods to control their server status response.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-31 16:36:49 -04:00
cpw
4ecb04ed9f
Merge branch 'pull/5636' into 1.13.x 2019-03-30 15:03:48 -04:00
cpw
e0361047f7
Fix StartupQuery to run properly on dedicated server.. Closes #5649 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-30 14:46:30 -04:00
tterrag
37016ca77f Remove remaining deprecations, improve a few patch comments 2019-03-29 16:58:33 -04:00
tterrag
98ef5049f4 Fix BrandingControl caching text through resource reload 2019-03-29 16:29:26 -04:00
cpw
944d760855
Fire the ModIdRemappingEvent on the Forge Event bus. Closes #5632 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-25 21:55:34 -04:00
tterrag
2f486f2bdd
Add method to IResourcePack to hide it entirely from the UI (#5525) 2019-03-25 17:24:37 -04:00
JoJoDeveloping
7e4101b3ad
Remove game registry comparsion from list ping 
Signed-off-by: JoJoDeveloping <jojohostert@gmail.com>
 2019-03-25 22:22:29 +01:00
cpw
d8d30e1f82
Defer configuration of channel until it is actually available during 
connection. Closes #5626

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-25 17:20:44 -04:00
Brennan Ward
36470f69ad Add class to wrap IItemHandler as IInventory for easier recipe interaction. (#5522) 2019-03-25 12:31:54 -07:00
mezz
5fa732d223 Remove uses of java.awt (#5591) 
`java.awt` will statically load itself when `java.awt.Color`, `java.awt.Dimension`, etc are loaded.
This conflicts with lwjgl3 and must be avoided (except for in mojang's server gui).
 2019-03-25 12:06:20 -07:00
Vincent Lee
5e7279b0a2 Fix PlayerInteractEvent using Dist when it should be using LogicalSide (#5611) 2019-03-25 11:41:08 -07:00
JoJoDeveloping
4764136d47
Re-Add the list ping compatibility checker 
Signed-off-by: JoJoDeveloping <jojohostert@gmail.com>
 2019-03-25 15:15:25 +01:00
tterrag
10a06157aa Update Night-Config to 3.5.0, improve defineEnum methods 
Closes #5537
 2019-03-23 00:12:48 -04:00
tterrag
d7ba9a50df Fix loading errors GUI crashing when errors occur during construction 2019-03-22 20:58:10 -04:00
LexManos
18400e8457 Revive CapabilityProvider on entity revive. Madders should NOT need this, as caps are copied via NBT. 2019-03-19 21:21:37 -07:00
LexManos
f5375783c6 Do not invalidate caps when entity is being moved across worlds. Should fix #5500 2019-03-19 14:10:29 -07:00
Ben Staddon
be18bdee88 Fix getDefaultCreatorModId for enchanted books (#5534) 2019-03-17 13:51:10 -07:00
tterrag
1e34f331da Handle null return from ResourcePackInfo.createResourcePack 2019-03-16 01:52:37 -04:00
cpw
d99a55a7d1
Allow login packets to only generate on server based connections 
Run injectSnapshot on the client thread, wait for result and
disconnect when injectSnapshot fails.
Fix DevServer to load MOD_CLASSES
Fix LaunchTesting to properly load log4j2 markers (don't use a
static variable in that class!)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-15 23:22:28 -04:00
its_meow
ff6fa31b1d Fix entity spawn packet pitch (reversed yaw/pitch) (#5603) 2019-03-13 12:53:48 -07:00
ichttt
00845d5252 Add UI for warnings that occurred during loading (#5530) 2019-03-11 15:32:37 -07:00