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

1775 commits

Author SHA1 Message Date
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
LexManos
7113f4400c Fix max entity radius not being settable by making it a instance method on world. Closes #5601 
Fix VoidFluidHandler.INSTANCE not being a instance of VoidFluidHandler. Closes #5602
Remove backwards compat code and make IItemHandler.isItemValid non-default. Closes #5598
 2019-03-11 15:04:04 -07:00
LexManos
47e6b34d2b DimensionManager.registerDimension now returns the DimensionType instance for convienance. 
You can still access others in DimensionType.getByName()
Fixed ForgeRegistry rappers not forwarding isEmpty.
 2019-03-06 21:01:12 -08:00
LexManos
3003e33074 Refactor Userdev and Forgedev launching. 
Locating mods on the classpath in dev should solve linked MC sources when debugging.
As well as loading deobfed mods.
Rewrote how arguments are handled in dev, so users can overwrite any defaults we provide.
Added basic Yggdrasil auth support. Passing in --username and --password arguments.
ONLY USE IF NECESSARY. Forge is NOT responsible for your login information.
 2019-03-06 20:59:32 -08:00
LexManos
7bd7b059c4 Make userdev parse out the classifier for the Forge jar that is on the classpath. 
Should fix debugging Minecraft at dev time.
 2019-03-06 12:06:49 -08:00
cpw
230d69b772
Tidy up network initialization, and force it to classload early in 
modloading lifecycle. Closes #5576

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-04 08:22:46 -05:00
cpw
8f5a2be6fd
Fix #5584 by copying the zipped resource to a temporary directory if 
paulscode is requesting it. This is so icky.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-01 22:07:11 -05:00
cpw
6db8b3c26d
Try writing a temporary file to disk when a paulscode thread requests 
a resource, because even zipfilesystems return interruptible file channels.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-03-01 19:46:59 -05:00
cpw
3c73dc2d0b
Put both LogicalSides on NetworkDirection: 
Origination (where it came from) and Reception (where it arrived at).

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-28 21:39:36 -05:00
LexManos
58494f8878 Rewrite the FML Handshake packet formats to include actually syncing the registry data and introduce the concept of caching it locally. 
Snapshots are not injected yet due top threading issues.
 2019-02-27 23:56:31 -08:00
cpw
cb70702ab5
Handle differing network versions for FML gracefully? 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-28 00:59:27 -05:00
cpw
7f1ea578d6
Fix problem with duplicate mods caused by duplicate classes found during scan. 
File Scan results are now sets.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-27 23:34:23 -05:00
cpw
dd7e7fc122
Try to fix #5573 by peeling the worldclient fetch into a separate handler. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-27 13:45:51 -05:00
Ben Staddon
af717ad788 Fix droppers not spawning items in world (#5559) 2019-02-25 00:47:37 -05:00
cpw
2a4e05c982
Allow vanilla connections properly, and allow mods to decide. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-24 13:52:26 -05:00
cpw
c219416bb8
Patch DimensionSavedDataManager to not spam FS mkdirs requests for 
empty files that don't exist yet, and don't contain data. Should
result in a significant performance improvement for those with slower disks.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-24 13:03:11 -05:00
cpw
8d1ff45c71
Fix GUI packet dispatch, add additional blockpos helper for common usecase. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-24 11:51:53 -05:00
cpw
245d0b6282
Fix startup Query to actually display (fixed commit). 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-23 20:42:45 -05:00
cpw
bbdf52e038
Update to 0.10 modlauncher API with performance improvements.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-23 14:36:05 -05:00
LexManos
1469df26db Delete old OreDictionary file, fix type in NUGGETS_IRON field name, and ping discord from jenkins. 2019-02-21 21:26:45 -08:00
LexManos
b7f6fbcfcb Merge extra and data jars. As Log4j has issues with it's config being in a different jar then the custom logger. 2019-02-21 04:24:39 -08:00
tterrag
329f26ee20 Add GuiUtils.drawInscribedRect, use in mod list GUI to fix logo rendering 2019-02-19 21:48:34 -05:00
tterrag
4b564b91bf Fix MinecraftForge.initialize not being called. 
Fixes UsernameCache and harvest tools
Closes #5529
 2019-02-19 12:33:41 -05:00
Cadiboo
ab92801740 Fix bug with ObfuscationReflectionHelper (#5509) 2019-02-18 14:12:07 -08:00
cpw
1d6536a53b
Move unsafehacks to separate JAR built separately.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-18 15:54:36 -05:00
tterrag
60315d079b Clean up Entity patches, remove extra method. Closes #5494 2019-02-18 15:52:01 -05:00
cpw
70be790b2a
Add a simple network API.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-18 15:09:03 -05:00
Jack Taylor
2e2c57dbd1 Refactor forge and example run configs based on MinecraftForge/ForgeGradle#546 
- Updated run config formats based on the refactored setup
- Removed old 'runclient' and 'runserver' JavaExec tasks, replacing them by creating the run configs using the refactored setup.
- Set 'assetIndex' environment variable from FG
- Updated MDK for new run config setup
 2019-02-18 14:39:05 -05:00
cpw
e47fa70279
Fix connection to vanilla servers. Generate a default mod server config 
for mods connecting to servers.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-17 16:07:47 -05:00
Vincent Lee
3f2c66dca5 Change openGui to take a Consumer<PacketBuffer> 2019-02-17 20:02:29 +00:00
cpw
579c3ecc0e
Fix assetIndexes for 1.13.1 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-16 17:16:34 -05:00
cpw
ae01194a5e
Merge branch 'pull/5484' into 1.13.x 2019-02-16 16:59:13 -05:00
gegy1000
3c006c4ca4
Fix lazy ModContainer evaluation skipping thrown loadingExceptions 
Fix formatting
 2019-02-16 16:58:54 -05:00
cpw
738d54ff4c
Fixes #5446 Listening for the same registry event in two different mods fails 
Tell the mod event bus not to track phasing for events.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-16 16:45:05 -05:00
cpw
7f9e8d059b
Fix network syncing of SERVER config. Enable COMMON Config. Fix network 
login handling.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-15 21:45:28 -05:00
cpw
36ccb3bbfe
Fix serverlang loading issue, by frontloading MC and Forge langs, 
so error messaging works.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-15 20:00:41 -05:00
cpw
3e516e54b2
Remove Forge ChunkLoader - vanilla has a new system. API will follow. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-14 23:15:40 -05:00
tterrag
2ec74e5c22 Fix RegistryManager#getRegistry not working for generic registry entries 2019-02-14 18:50:15 -05:00
tterrag
9d56309a05 Fix license headers 2019-02-14 18:49:40 -05:00
LexManos
2f547c8c56 Fix javac compile issues. 2019-02-14 15:21:28 -08:00
LexManos
ca72710937 Initial 1.13.2 update. Major thing to note is that Dimensions have been completely revamped. 
DimensionType is not unique per Dimension. See DimensionManager for more details.
Vanilla now has a chunk loading system, so Forge's will need to be deprecated/adapted.
 2019-02-14 15:08:53 -08:00
cpw
9a1688599a
Actually fix byte array behaviour for openGui. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-14 14:34:39 -05:00
cpw
d6c3df32d6
Fix byte array behaviour for OpenContainer packet 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-13 23:25:48 -05:00
cpw
28c0ffe333
Clean up the mod loading context objects. There is only one ThreadLocal now. 
**BREAKING CHANGE** FMLModLoadingContext is renamed to FMLJavaModLoadingContext.
LanguageProviders can setup additional contextual data.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-13 22:13:59 -05:00
cpw
586c24f9d6
Implement a GUI packet and GUIFACTORY for triggering from the server. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-13 21:06:39 -05:00
cpw
31c0a70f8e
Merge branch 'pull/5451' into 1.13-pre 
# Conflicts:
#	patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
 2019-02-13 18:59:43 -05:00
cpw
64a92530d9
Handle bad formats with an exception. Translators MAKE SURE you watch for this error! 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-13 18:54:43 -05:00
cpw
d9c4446ccc
Enable https to Let's Encrypt endpoints by using an SSL factory with 
the two extra Let's Encrypt root certs installed into an auxiliary
keystore.

The keystore was generated using standard commands, documented in the
FixSSL class.

The Let's Encrypt certificates are not provided by default in Java 8
prior to update 101.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 23:41:40 -05:00
cpw
f83500db11
Its 2019. Update licence headers to match. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 17:57:03 -05:00
cpw
fd02d81e73
Fix Terminal Handler and GUI logging on dediserver, hopefully.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 17:51:25 -05:00
cpw
0d379fdd6b
Fix config to use new system properly, without exploding the server. 
Separates server specific config into the server config file.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 16:38:14 -05:00
cpw
c6afb2be3f
Move to using Minecrell's terminal logger directly, for better ANSI control and JLine support. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 14:35:21 -05:00
cpw
dae5994e9d
Tidy up modcontainer building and discovery.. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 11:44:47 -05:00
cpw
b28a418bd9
Use a configuration value for the thread count, make it default to 
availableProcessors when set to <=0 (default value is -1)

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2019-02-10 11:44:22 -05:00
m00nl1ght-dev
8084ca43b9 Port CommandEvent and custom entity selectors to 1.13 (#5411) 2019-02-08 17:41:50 -08:00