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

1674 commits

Author SHA1 Message Date
Vincent Lee
153e7a1806 Tentatively reintroduce a container-opening system 2019-02-07 20:31:17 -06:00
tterrag
79c17cb542 Add IExtensibleEnum, fix DimensionType create method 2019-02-07 16:36:30 -05:00
LexManos
9245975955 Change IRenderHandler to an interface Closes #4640 2019-02-07 12:03:13 -08:00
LexManos
0b1b3c68fa Invalidate capabilities that we attach to vanilla entities and TileEntities. Closes #5307 2019-02-06 22:55:17 -08:00
LexManos
d930c8ae8b 'Fix' Specific y-levels in water behaving like you're in air. Closes #5341 2019-02-06 21:43:37 -08:00
LexManos
053c5300ed Reintroduce ObfuscationReflestionHelper closes #5373 2019-02-06 20:46:21 -08:00
LexManos
e8ae18efda Fixed Crosshair attack indicator texture issue Closes #5442 
Add friendlier error message for @Mod annotations with missing mods.toml entry. Closes #5440
Remove Log4J console highlighting. As it doesn't work on many consoles, and prints invalid characters. Closes #5420
 2019-02-06 18:18:01 -08:00
LexManos
71dd5c9f4d Properly set context classloader in mod loading threads. 2019-02-05 22:42:21 -08:00
LexManos
aa91af865d Rework server launching at runtime to include needed default arguments and validate libraries exist. 
Move Forge config loading to manual while config system is in development.
 2019-02-04 18:23:58 -08:00
Merlin Addams
68433924c7 Fix redstone power calculation (#5433) 2019-02-04 11:38:54 -08:00
Merlin Addams
87b67cb45a Fix wrong grass block being used for comparisons (#5434) 2019-02-04 11:38:01 -08:00
cpw
e000fd2f8f
Put the FMLModContainer back in it's cage. Delete the ClasspathLocator. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-01 20:37:04 -05:00
cpw
e4d20a80ed
Use the resource pack directly in the GuiModList, skip the resourcepackinfo. 
Closes #5418

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-01 16:55:28 -05:00
cpw
6365674a2a
Config watching and config events now actually work! 
Also fixed small bug with MOD_CLASSES not defaulting to empty string.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-29 15:42:56 -05:00
cpw
7a02ccc3a8
ConfigEvents - the beginning. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-28 22:42:37 -05:00
cpw
2918864248
Merge branch 'pull/5405' into 1.13-pre 2019-01-28 20:50:12 -05:00
cpw
9fbfe2b98e
Fix 5408 by making Paths from the default provider (not inside jars) 
offer a FileInputStream rather than Files.newInputStream. Fun. Stupid
ancient paulscode.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-28 20:37:25 -05:00
LexManos
b40e2cc59e More old patch work, cleaned up static methods added to ItemStack, and various networking functions. 2019-01-28 16:25:49 -08:00
ichttt
3eac9c536b Config option implemented 2019-01-27 22:02:58 +01:00
ichttt
ad32b01d85 Reimplement update checker 2019-01-27 21:23:24 +01:00
ichttt
da33233762 Update for ForgeSPI change, revert back to VersionStatus checking 2019-01-27 20:51:35 +01:00
ichttt
c2a7fe4019 Bring back the forge beta warning. Use a check to see if the forge minor version is zero, as ForgeVersion.getStatus() is not implemented 2019-01-27 19:50:59 +01:00
tterrag
8e43dfa7a6 Refactor OptionalCapabilityInstance to LazyOptional; clean up 
- Move to util package, rename to LazyOptional
- Clean up existing javadocs, add javadocs to everything missing them
- Add more NonNull functional interfaces, and use them everywhere
- Move orEmpty() to Capability, works better here anyways
 2019-01-27 01:41:07 -05:00
cpw
0a11ffb827
More logging tweaks, including some aimed at userdev. 
`forge.logging.markers=<LIST OF MARKERS>` will enable markers.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-27 00:06:57 -05:00
cpw
3c55b46ca0
Big cleanup of logging. Might do some tweaks of the userdev logging, but this should be good for vanilla.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-26 22:18:28 -05:00
ichttt
9ee34f57f5 Fix some of minecraft's resources loading twice, as minecraft is on the list of namespaces as minecraft and as an empty string 2019-01-26 23:23:05 +01:00
cpw
c578cae676
Fix resource pack info generator - use the first modid as part of the 
pack prefix.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-26 16:56:10 -05:00
Vincent Lee
13f9418201
Send head yaw, use setPositionAndRotation 2019-01-26 10:25:20 -05:00
Vincent Lee
a771a3ea06
Add license header 2019-01-26 10:25:20 -05:00
Vincent Lee
1f11ac76fa
Readd modded entity spawning/tracking support 2019-01-26 10:25:19 -05:00
mariaum
2e1456517a Fix first call to ToolType.get always returning null (#5396) 2019-01-25 22:40:03 -05:00
SquidDev
659091c565 A couple of minor improvements and fixes to ForgeConfigSpec (#5394) 
- Use the config file's path instead of the config object in error messages.
 - Print the dotted path of each config key instead of the array version (group.item instead of [group item]).
 - Fix comments causing a config file to be considered incorrect.
 - Pass each list element to the element validator, rather than the whole list.
 2019-01-25 13:43:06 -08:00
mezz
c8c54113d0 Add RecipesUpdatedEvent, fired when recipes are downloaded from the server. (#5303) 2019-01-25 13:36:42 -08:00
Vincent Lee
69f8e57cea [1.13] A sweep through deprecations (#5345) 2019-01-25 13:29:52 -08:00
ShetiPhian
06a6fac23a Add a RayTraceResult method to Block that can be can be overridden (#5354) 2019-01-25 13:29:07 -08:00
Vincent Lee
fa939a890c [1.13] Make Caps, TESR, Entity renderers, and keybinds thread safe to call during parallel init (#5359) 2019-01-25 13:14:49 -08:00
LexManos
7a651b8c1f Repatch missed hasTileEntity redirects. And cleanup related patches. Closes #5369 2019-01-25 13:11:06 -08:00
mariaum
6643997304 Fix #5365: Some chat messages lose their formatting (#5386) 2019-01-25 11:19:49 -08:00
LexManos
7b867d0069 Fix vanilla trying to load the constants json as an recipe. Closes #5388 
Force constant names to use namespace of their json file. To prevent conflicts.
 2019-01-25 11:18:25 -08:00
Brennan Ward
a15c4dc9b0 Add recipe types for faster runtime iteration. (#5312) 2019-01-25 10:22:41 -08:00
tterrag
7c11fe1022 Fix capability attach event not firing with base type 2019-01-24 21:04:50 -05:00
cpw
040cc4bf16
Expose a couple of mods.toml properties properly. Half-implemented 
override namespace - still needs to be reviewed and determined how this
might work in detail.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-20 21:26:31 -05:00
SquidDev
eefc4d3e84
Use the reply logical side when enqueing work 
When receiving a packet, NetworkDirection.getLogicalSide details where
the packet was the packet was sent from. Therefore, on a client it'll
be SERVER (and vice virsa), and so the work is queued on the sever
thread, instead of using Minecraft.
 2019-01-20 12:31:12 -05:00
ichttt
c3c979f11a
Use minecraft's util class to open files 2019-01-20 12:23:44 -05:00
ichttt
276d0c49c1
Validate mod ids 2019-01-20 12:23:44 -05:00
cpw
7c840dce35
Fix classcast in autoeventsubscriber, also actually make progression 
work properly. This whole thing is a bit of a gross hack.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-20 12:20:27 -05:00
alexbegt
2bee5f7ac6 Fix recipe constants being overridden by a blank map. Closes #5380 2019-01-20 16:03:09 +00:00
cpw
60524f0f3e
Fix case error in AutomaticEventSubscriber 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-20 00:32:11 -05:00
cpw
f4d2d1a24b
Move Registry Events to the mod event bus. 
Add infrastructure to allow parallel or synchronous dispatch of
mod events, and pass-through of events to the dispatch system.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-01-19 23:27:27 -05:00
tterrag
ff2e35c243
Greatly improve DeferredWorkQueue API (#5357) 2019-01-18 21:10:22 -05:00
tterrag
0d1a2f2af3 Add utilities that RuntimeEnumExtender expects to exist 2019-01-17 13:11:54 -05:00
LexManos
3b029ba031 Re-introduce patch for injecting registry mappings during world loading. 
And re-introduce registry freezing to ONLY the Register events.
Filter ObjectHolders by registry type and fire between every Register event.
 2019-01-16 12:28:13 -08:00
tterrag
cd21f7b927
Implement ConfigValue as a wrapper around ForgeConfigSpec results (#5361) 2019-01-15 23:28:40 -05:00
cpw
56a3926b86 Fix up event naming, move them to sensible packages and document everything a bit. 2019-01-14 22:43:17 -05:00
Vincent Lee
220bf8730a [1.13] Expand tag deserializer to add optional values and remove values without overwriting everything. (#5350) 2019-01-14 19:23:36 -08:00
mezz
118eac8f39 Fix mod lifecycle event names 2019-01-14 14:00:15 -08:00
cpw
99452a8b45 Update a bunch of libs, rename some of the mod events to more 
meaningful names.
 2019-01-14 00:39:00 -05:00
LexManos
eb42614288 Add list support to ForgeConfigSpec. 
Fix incorrect Supplier used in ForgeConfigSpec.
Port ForgeChunkManager config to new system.
Delete old Configuration classes. It's finally gone!
 2019-01-11 23:01:08 -08:00
XCompWiz
f2b54acd67 Allow providing a BufferedImage for banner render generation (#5041) 
Ported to 1.13 using NativeImage

Co-authored-by: tterrag <tterrag1098@gmail.com>
 2019-01-11 18:32:17 -05:00
Tim
497bc10d0a Fix Mesa biome entry tags in the BiomeDictionary (#5177) 2019-01-11 18:32:17 -05:00
tterrag
958bbf6c9a Fix MC-136995 - Chunk loading and unloading issue with entities placed in exact positions. (#5160) 
This includes three commits from 1.12.x:
c20a5e8805
93b704b459
ee0d43bbde

Scatter gun patches to improve entity tracking and position tracking.
Provided by Aikar through the Paper project, this commit of patches combines the following patches:

fd1bd5223a/Spigot-Server-Patches/0306-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
fd1bd5223a/Spigot-Server-Patches/0315-Always-process-chunk-registration-after-moving.patch
fd1bd5223a/Spigot-Server-Patches/0335-Ensure-chunks-are-always-loaded-on-hard-position-set.patch
fd1bd5223a/Spigot-Server-Patches/0378-Sync-Player-Position-to-Vehicles.patch

Co-authored-by: Gabriel Harris-Rouquette <github@gabizou.com>
 2019-01-11 18:32:16 -05:00
David Quintana
e98951ee65 Fix blockstate id map calculation. (#5279) 2019-01-11 14:52:30 -08:00
LexManos
3765d912a5 Move @EventBusSubscriber application to just after construction instead of pre-init. 2019-01-11 12:28:06 -08:00
Vincent Lee
985a48f02e Fix datapack walking not working for mod datapacks. Closes #5334 (#5335) 2019-01-09 20:59:40 -08:00
Vincent Lee
4e196a445a Add missing setSeed calls to ForgeBlockModelRenderer (#5338) 2019-01-09 20:57:55 -08:00
LexManos
36d2e67b07 Reimplement @ObjectHolder scanning, and expose system for others to add handlers. 
Fix forgedev and userdev run configs.
Fix issue in log functions assuming String arguments.
 2019-01-09 20:57:01 -08:00
LexManos
f7acc73282 Update userdev and runconfigs for ForgeGradle changes. 2019-01-08 00:29:36 -08:00
cpw
f734e614e4 Fire registry events before preinit and after construct. 2019-01-06 17:19:18 -05:00
cpw
1b40618f02 Fix classloading properly. ModLoadingClassLoader doesn't work 
with the proper delegation model. Abandoned it, in favour of injecting
locators into the Transformer classloader directly.
 2019-01-06 16:24:32 -05:00
cpw
58c78560fa Fix up some stuff with resource packs, so the guilist works properly. 2019-01-05 10:19:47 -05:00
cpw
fd9c83b65f Finish up classloading system. Use ModJARURL to locate resources 
and enable ModLauncher to use those instead. This allows all mods to load
within the scope of the game classloader, removing weird conflicts and
class discovery problems.
 2019-01-04 23:56:10 -05:00
cpw
6baddc7e26 client and server work standalone and in forge dev. Next up userdev. 
Moved some launchplugin code to the launcher. Moved servermain to
the launcher.

server currently needs cmdline arguments  --fml.forgeVersion=24.0.51-1.13-pre --fml.mcVersion=1.13 --fml.mcpVersion=2018.09.12.04.11.00 --fml.forgeGroup=net.minecraftforge.test
 2019-01-01 21:35:23 -05:00
cpw
e9580877b4 fix up some discovery code, and make regular runtime _mostly_ work. 
Still WIP and doesn't quite get to main screen yet.
 2019-01-01 16:50:04 -05:00
LexManos
440649bb95 Fix new launcher jar packaging. 
Run license checker over new code.
 2018-12-31 16:48:23 -08:00
cpw
48846bc0ba separated fmllauncher code from main forge mod code. This enables much 
stronger classloader separation between the two sides. Forge now
loads as a regular mod.

Still needs a bunch of debugging, but structure looks good and game loads
in forge dev.
 2018-12-31 16:34:33 -05:00
cpw
558e1d2fb0 ResourceLocation Utils for doing things.. 2018-12-31 16:34:33 -05:00
tterrag
0b26047ea8 Better documentation for IForgeWorldType, TERFast, TERAnimation 
Also rename AnimationTESR to TileEntityRendererAnimation
 2018-12-29 12:18:10 -05:00
tterrag
7f5a57f4af Fix patch mistake in IForgeWorldType: CUSTOMIZED -> BUFFET 2018-12-29 12:01:41 -05:00
mezz
dc12cda505
Clean progress bar code and fix TextureMap patch (#5304) 2018-12-28 18:05:05 -08:00
mezz
b4cf6f7f36
Implement GuiScreen events for mouse and keyboard (#5297) 2018-12-23 23:46:42 -08:00
mezz
f2f04407a4
Add the sender to NetworkEvent.Context for server-side event handlers (#5295) 2018-12-22 23:24:11 -08:00
tterrag
8a11e3bac4 Port most of the world patches (#5294) 2018-12-22 10:31:18 -08:00
LexManos
4879b0611a Change how Forge itself is located to be loaded similar to a real mod. 
Fixes Minecraft/Forge annotation data missing.
Fix Capability injection.
 2018-12-21 16:07:39 -08:00
tterrag
d11a67499d FastTESR -> TileEntityRendererFast 2018-12-21 17:53:01 -05:00
tterrag
b3b8c78527 Rendering patches (#5262) 2018-12-21 14:45:35 -08:00
LexManos
a992a4325b Change getWorld function name to prevent inheritance change in Chunk 2018-12-18 16:11:03 -08:00
David Quintana
c1225f3876 Fix the path handling for mod jar resource packs. (#5228) 2018-12-18 12:48:39 -08:00
David Quintana
152836c907 Add raytrace logic to the GuiOverlayDebugForge, so that the debug overlay can show the currently targetted block and liquid. (#5278) 2018-12-16 12:47:16 -08:00
David Quintana
52b6da1759 Fix classloading issues in userdev (and possibly also for things like tests within forgedev) (#5275) 2018-12-13 15:33:35 -08:00
LexManos
f13465012b World and TileEntity patch work. 
TerrtainGen events are removed, 1.13's world gen re-write invalidates them all.
 2018-12-13 01:15:53 -08:00
LexManos
7265900c62 More entity patch work. ISpecialArmor deleted. 2018-12-10 22:19:43 -08:00
Liqueur Librazy
719ea50d1a Use getRawSchemeSpecificPart to preserve escape characters in uri, fix #5236 (#5237) 2018-12-10 11:07:50 -08:00
LexManos
bbf1ea41b8 world.gen.feature patches, worldgen should be stable with vanilla. In all places I looked. 2018-12-06 18:09:47 -08:00
LexManos
eb22f42fea More patch work, our async chunk loading doesn't appear to be viable for 1.13. 2018-12-05 18:08:27 -08:00
LexManos
dd32e74e34 Entity patches progress. 2018-12-05 01:16:33 -08:00
malte0811
e1b4a150c3 Fix race condition causing the FML handshake to hang (#5222) 2018-12-04 12:22:01 -08:00
LexManos
76d912c0ba Include project group in ForgeVersion and determine path to patched jar. 
While testing we install to net.minecraftforge.test. So don't hardcode it.
 2018-12-04 11:55:50 -08:00
LexManos
a3c8e04ee6 Item and NBT patches, IShearable blocks are responsible for setting themselves to air, to allow for setting other states. 2018-12-03 18:04:37 -08:00
LexManos
bf9158172f Most client patches done except the render pipeline. 
Someone who has more in depth knowledge of that rendering system will need to do it.
 2018-11-28 22:15:05 -08:00
LexManos
47a11b9a7e GUI Patches 2018-11-21 21:23:24 -08:00