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

1706 commits

Author SHA1 Message Date
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
LexManos
b6ddb0a7cf More patchwork. 2018-11-19 19:55:46 -08:00
LexManos
7c0d94ce9c Patch work, most of block classes, and fix eclipse run configs. 2018-11-16 23:15:39 -08:00
malte0811
b5264cacf0 Fix crash when placing furnaces or brewing stands in 1.13 (#5225) 2018-11-15 13:55:18 -08:00
David Quintana
64c8f67939 Add missing license headers. (#5192) 2018-10-19 20:35:29 -07:00
tterrag
74703e2a60 Fix mod asset loading 2018-10-11 18:06:16 -04:00
cpw
43ed744d46 run textcomponenttranslations through the ForgeI18N message format translator as well. 2018-10-05 22:21:30 -04:00
cpw
e199e78a4f load languages on the server as well as the client, and fix up a bunch of data packs. 2018-10-05 21:42:15 -04:00
cpw
1c9b5fae5e Server run profile, also setup logging for client profile. 2018-10-05 01:25:27 -04:00
cpw
2b23eb96fb Tweak library locating code. Works well on vanilla and dev now. 2018-10-04 23:24:02 -04:00
cpw
ca765b857b Move the version packages somewhere that is now filtered so it doesn't 
load twice.
 2018-10-04 19:28:45 -04:00
cpw
978d0ff2e3 Fall colours 
🎃🎃🎃🎃🎃🎃🎃🎃🎃🎃
 2018-10-04 18:40:34 -04:00
cpw
129870dbe8 Missing language now presents to the UI. 2018-10-04 11:31:08 -04:00
cpw
d5e04dbcb5 Better error passing from early to game client launch. 2018-10-04 00:57:08 -04:00
cpw
c6e7bbe18b Use the maven artifact code rather than our very outdated copy 2018-10-03 22:47:07 -04:00
cpw
0b11b0e6bb Launch in the vanilla launcher now. 2018-10-02 00:32:41 -04:00
cpw
6485a48d79 Use latest paulscode (removes need for soundfix transformer) and fix gitignore. 2018-09-30 14:29:14 -04:00
cpw
fe12687ec1 Branding fixup. 2018-09-30 14:29:14 -04:00
cpw
0024d9d283 Config GUI tweaks, and MCP is now part of the "minecraft" entry. 2018-09-30 14:29:14 -04:00
cpw
015ac2547e Fixup the config GUI and get things working again. 2018-09-29 01:29:49 -04:00
cpw
bb9eca96a8 Basic error display GUI. 2018-09-28 21:07:46 -04:00
cpw
09e2aeaec4 Some tweaks to get the launcher working. 2018-09-24 00:07:33 -04:00
LexManos
94e1a8e0a4 Update mappings to 09/21 snapshots. 
Conflict with getMatrix in ITransformation, so renamed to getMatrixVec.
 2018-09-22 03:40:22 -07:00
LexManos
5ed03945a0 Disable eclipse compiler and switch to SRG patches. 2018-09-22 00:38:21 -07:00
tterrag
d08f8e1a78 Fix remaining issues preventing compilation, launching, and loading worlds (#5156) 
Fix duplicate ID for ingredient serializers
Fix KeyBinding compile errors. No GuiKeyBindingList patches yet.
Implement controls GUI and WorldServer patches
 2018-09-21 19:07:48 -07:00
LexManos
c191851ec0 Fixed all compile errors except the 4 in KeyBinding. 2018-09-21 15:50:37 -07:00
LexManos
a0e217b1dc More because git likes to split to many 2018-09-21 02:17:20 -07:00
LexManos
e2a17ac31b Ran License checker to fix the headers of files missing them. 2018-09-21 02:15:03 -07:00
LexManos
cdfa7caaeb More work on compile errors, New system for ToolClasses, using a ToolType class instead to de-stringify things. 2018-09-21 01:47:12 -07:00
Anthony Anderson
0cd21ebe7e Block patches and event work (#5138) 2018-09-20 13:11:02 -07:00
LexManos
b25f92b0c0 Add concept of pushing/poping levels to ForgeConfigSpec as well as comments on those levels. 2018-09-18 12:19:19 -07:00
tterrag
c4cf950863
Fix the rest of the "easy" compile errors (#5151) 
* Add Entity.changeDimension patch and transitively required patches

* Fix throws declaration on CommandSetDimension#execute

* Fix rest of errors in fluid package

* Add PLAYER_REACH attribute

* Fix compile errors in fml.client.config and add GuiButton patch

* Delete unnecessary client.config classes, fix all config errors

* Comment some fluid errors in models

* Fix all errors in common package root, except ForgeHooks

* Mass comment network package

* Experimental conversion of extended states to generic base class

* Fix errors in common.util

* Remove config annotation stuff cuz lex said so

* Make extended state stuff compile fully
 2018-09-18 00:04:02 -04:00
LexManos
6814cbf0df Beginning work on redesigning Config API. 2018-09-17 20:40:42 -07:00
LexManos
02c31cc867 More work on recipes, custom ingredients, recipes, and constants should work now. 2018-09-17 03:41:16 -07:00
cpw
03d19f2e70 Tweak to remove javac compile errors related to generics on registries. 
Also remove the recipes registry call - they're gone from registries completely.
 2018-09-16 22:27:08 -04:00
cpw
abacf8e141 Net handling pass 2. Tidied up login packet sourcing, generate registry packets. 2018-09-16 20:59:25 -04:00
cpw
9f2c7c881c Net Handshake phase 1. Validates pairings on client and server. 2018-09-16 20:56:10 -04:00
LexManos
afead63381 Migrate most of the OreDictionary to tags. 2018-09-16 16:28:21 -07:00
tterrag
231dfeee31 Enforce bounds on min/max registry IDs 2018-09-16 16:59:08 -04:00
LexManos
c77d00efe4 Recipe work. No longer a registry. OreDictionary related code removed in favor of Tags. Started moving some OreDict items to tags. 
Added code to RuntimeEnumExtender to return existing enum values with the same name if they exist instead of creating more.
 2018-09-16 04:20:28 -07:00
tterrag
e3a931bf96 Fix errors in commands and getDimension->getId 2018-09-15 15:02:38 -04:00
LexManos
b4c23aba8e Command work, and Added TileEntityType as a Forge Registry. 2018-09-15 00:59:19 -07:00
tterrag
3f743887e7 More compile cleanups. (#5139) 2018-09-14 09:30:56 -07:00
tterrag
949a62a0da
Fix most of the compile errors in the client package (#5137) 
* Add KeyBinding#getKey and clean up errors in KeyModifier

* Add dimension IRenderHandler patches

* Fix most of the compile errors in client package.

The rest are missing Block/KeyBinding patches

* Disable selective reloads until configs are finished

* Add OnlyIn on IForgeDimension to match those of Dimension
 2018-09-11 21:42:29 -04:00
LexManos
a0cef07a0b Pin MCPConfig version 
Cleanup and implement BrewingRecipes
Delete client command related things
Cleanup some biome stuff.
 2018-09-11 18:25:25 -07:00
cpw
f72a7e02e3 Fix vanilla bug with GLFW init error display - actually the error, not the memory address containing the message 
Load natives from the environment var, not hardcoding.
 2018-09-10 20:31:51 -04:00
LexManos
bec9214d0c Fix launching in dev 2018-09-10 13:08:35 -07:00
cpw
a4f2802306 Add I18n accessor, fix up some mod log messages, make the EnumExtender work. 2018-09-09 23:35:02 -04:00
tterrag
334d925972
Port capability patches to 1.13 and refactor to new system (#5134) 
* resource package and misc leftover rendering stuff

* Port Item and ItemStack patches

* Extract most item patches to interface

* Refactor Item#setNoRepair to be part of Item.Builder

* Adapt AnimationItemOverrideList to new cap system

* Improve null contract of OptionalCapabilityInstance

* Remove Capability.cast

* Update CapabilityAnimation to new cap system

* Remove OptionalCapabilityInstance#flatMap and add NonNullConsumer

* Add capability patch to Entity, not everything yet

* Fix Entity patch and add missing methods to IForgeEntity

* Fix null contract of CapabilityDispatcher

* Add TileEntity caps

* Adapt FluidUtil to new cap system

* Add world caps

* Add chunk caps

* Clean up cap patches

* Replace all tabs with spaces

* Move builder methods on Item to Item.Builder

Whitepsace fix

* Sided stuff take 2

* Prevent OptionalCapabilityInstance creating additional empty instances

* Cache getCapability result in AnimationTESR

* Fix imports in TileEntity patch

* Pull out cap code to base class, add village caps
 2018-09-09 17:27:15 -04:00
mezz
f851b37aa0 Initial blind port of the mod error screens 2018-09-09 12:46:56 -07:00
tterrag
dde7dccef1 Porting Forge rendering code to 1.13 (#5132) 2018-09-08 13:34:59 -07:00
LexManos
eac693e785 Introduce rework of Capability provider. And reduce errors to <2000 2018-09-06 06:27:24 -07:00
LexManos
12869710de Remove old paulscode libraries. 
Re-work EnumHelper and ObjectHolder systems to bypass JITer of final fields.
Other cleanups.
 2018-09-06 04:39:01 -07:00
LexManos
2798080f60 More error cleanup, reinstanted IForgeReigstryEntry. 
The abstract class will be used as the default, and to enable delegates but we should keep it api simple by keeping the interface.
Removed some patches that didnt get removed in the rebase.
 2018-09-05 20:06:18 -07:00
LexManos
ff6fa2cfaf Add some missing libraries and work on GuiIngameForge. Down 700 errors. 2018-09-05 18:00:14 -07:00
cpw
f818cc8f71 Tweak 2018-09-05 13:14:16 -07:00
cpw
d7e9217695 Network init 2018-09-05 13:14:16 -07:00
cpw
b50b768852 Server starts 2018-09-05 13:13:53 -07:00
cpw
330db1a54d Patches deleted 2018-09-05 12:58:49 -07:00
cpw
77c3310711 Zeroth pass on 1.13 2018-09-05 12:56:01 -07:00
cpw
6e99f84e91 Moving some stuff around, network and server events. 2018-09-05 12:37:20 -07:00
cpw
689ebd8036 Dediserver runs and talks to clients. 2018-09-05 12:35:31 -07:00
cpw
506b51f189 A much more straightforward networking system. 2018-09-05 12:33:38 -07:00
cpw
4636365e30 Some beginnings of a network again. 2018-09-05 12:31:47 -07:00
cpw
d0ab0e166c Well, it works, for a game, now. 2018-09-05 12:30:02 -07:00
cpw
06b16aaa19 Some more stuffs. ObjectHolder's replacement? 2018-09-05 11:58:31 -07:00
cpw
baa9dfe55a Things. they work. Obviously still WAY more to do. 2018-09-05 11:53:54 -07:00
cpw
1b1ee6f0b8 more things. Moving ModContainer around. 2018-09-05 11:49:48 -07:00
cpw
f279a07586 metadata is dead 2018-09-05 11:40:48 -07:00
cpw
3b78e97ad8 Fidgeting while the world burns 🔥🔥🔥🔥🔥🔥 2018-09-05 11:40:48 -07:00
cpw
f942eb184a WOW 😲 such broken. Many brokes. 2018-09-05 11:40:47 -07:00
cpw
c1f0e1b68f Holy Moly, it's a big fat commit of broken code! 2018-09-05 11:16:33 -07:00
cpw
5b05e103f4 Starting to put the launch itself together 2018-09-05 10:56:03 -07:00
cpw
7e5bd4ecdb Access Transformer. Starting to try and launch things. 2018-09-05 10:56:03 -07:00
cpw
c38d2e48cd Early signs of modloading 2018-09-05 10:55:15 -07:00
cpw
66b6150027 Coremod 2018-09-05 10:55:15 -07:00
cpw
14ac77e444 Goodbye @Mod, it was lovely knowing you! 2018-09-05 10:54:20 -07:00
cpw
d23850ff98 Goodbye @Mod, it was lovely knowing you! 2018-09-05 10:49:33 -07:00
cpw
3e4f3ff142 Delete MarkerTransformer. I don't think this has been used in years. 2018-09-05 10:47:56 -07:00
LexManos
8ace535995 Fix --mods and --modListFile arguments not making it past LaunchWrapper. 2018-09-03 21:20:23 -07:00
Ben Staddon
f2da4be93e Remove BlamingTransformer (#5115) 2018-08-26 18:57:44 -07:00
LexManos
4aaa0370ab Fix more apache exclusions. 2018-08-22 11:56:35 -07:00
LexManos
c6abcf5b84 Change org.apache to org.apache.maven. class loader exclusion. 2018-08-21 23:50:25 -07:00
Ben Staddon
69233f1bbf Add variant alias for item models not loaded via blockstate (#5025) 2018-08-16 13:21:21 -07:00
mcenderdragon
f6b3893a05 Added getter for children of CompoundIngredient (#5082) 2018-08-16 13:19:45 -07:00
Ben Staddon
222a110eb1 Fix saved toolbars not working with non-vanilla items (#5063) 2018-08-16 13:17:27 -07:00
Ben Staddon
6ece0ba254 Fix server watchdog thread occasionally crashing on first run (#5019) 2018-08-16 13:16:31 -07:00
TheIllusiveC4
8e7b5be3d4 New SleepingTimeCheckEvent to add yet another way to control sleeping. (#5013) 2018-08-16 13:14:34 -07:00
Ben Staddon
1171668c25 Allow sending packets to client from ServerConnectionFromClientEvent (#4991) 2018-08-16 13:03:32 -07:00
TheCyberBrick
1f58bd71c0 Fixed overworld spawn point reset when respawning in another dimension (#4982) 2018-08-16 12:55:11 -07:00
Pyrofab
dd0c251b3d Fix ModList cache never being updated (#5081) 2018-08-16 11:54:56 -07:00
DaemonUmbra
afd6de3e30 Fix blank Server GUI console log (#5089) 2018-08-09 22:12:42 -07:00
mezz
cfa33be24b Fix SlotItemHandler.isItemValid check 2018-08-09 21:18:29 -07:00
mezz
5a48ca99b6 Improve performance of FluidRegistry.getBucketFluids 2018-08-01 22:29:10 -07:00
Ben Staddon
889fa4da7e Fix received data for last vertex format element not being recorded (#5074) 2018-08-01 13:35:56 -07:00
Karthas077
682a867a91 Fix missing lang entry for Swim Speed attribute (#5064) 2018-07-29 14:21:24 -07:00
Ben Staddon
f3f1e585dc Add function to lookup model location for an ItemStack (#5017) 2018-07-28 18:55:33 -07:00
Ben Staddon
14bfeefb4d Allow custom SpawnPlacementType registration (#4973) 2018-07-28 17:51:44 -07:00
gegy1000
a935859b24 Resource type sensitive ResourceManager reloading, Disabled by default, but may increase performance. (#4658) 2018-07-28 17:47:01 -07:00
Cody Brittain
4acfca27f8 Add functionality in IItemHandler to test if a slot can accept an item (#5033) 2018-07-28 17:38:18 -07:00
Eragonn1490
36f74e955b Add wooden doors to the OreDictionary. (#5036) 2018-07-28 17:32:59 -07:00
Ben Staddon
2786cd279c Update and clean up Forge fluid render model (#4763) 2018-07-17 20:37:20 -07:00
mezz
ab228832f2
Allow configuring log levels using system properties. (#5024) 
Defaults are:
-Dforge.logging.mojang.level=info (note that setting this to debug or trace will enable extra debug behavior which may slow things down or detect issues and crash)
-Dforge.logging.console.level=info
-Dforge.logging.file.level=info
-Dforge.logging.debugFile.level=trace
 2018-07-15 13:22:41 -07:00
Ben Staddon
6ae2287d57 Add support for FluidStack-dependant colouring to Forge bucket (#4952) 2018-07-14 14:52:54 -07:00
MrRiegel
cfebf27393 Use itemstack in LivingEntityUseItemEvent.Finish before it was used (#5015) 2018-07-14 14:29:32 -07:00
bloodmc
603f4bd7a3 Check use item result before calling onItemUseFirst. (#5016) 2018-07-14 14:28:42 -07:00
tterrag
97d58aeaa1 Clean up and improve ICapabilityProvider javadocs (#4978) 2018-07-14 14:08:22 -07:00
mezz
c6f001bb6c Update license header on ChunkIOThreadPoolExecutor 2018-07-09 21:22:58 -07:00
tterrag
a98db5bef2 Fix potential deadlock when chunkload raises non-IO exception (#4861) 2018-07-09 13:45:50 -07:00
Ben Staddon
5624afbc32 Change some client hooks to use GlStateManager functions (#5010) 2018-07-04 19:59:12 -07:00
Weissmoon
1902363eac Write full class name in undefined packet error messages. (#4970) 2018-07-04 19:58:36 -07:00
Ben Staddon
58d570a6f1 Fix ItemHandlerHelper.giveItemToPlayer creating item entities with incorrect contents (#5007) 2018-07-02 22:41:18 -07:00
LexManos
0cf5ef221c Run licenseFormat to apply license header to all files. 2018-07-01 14:17:31 -07:00
Minecrell
eb94dc5c48 Restore original license headers in Maven versioning package 2018-07-01 14:01:38 -07:00
Minecrell
97627e7fb9 Restore original license headers of delta package 2018-07-01 20:30:52 +02:00
Ben Staddon
80724a52d3 Fix some ClassCastExceptions incorrectly being logged in FML handshake. (#4972) 2018-06-27 12:56:46 -07:00
KingLemming
19de6cf97e Fix ISpecialArmor to allow for "Unblockable" damage to be handled if the armor opts in. (#4964) 2018-06-27 12:53:45 -07:00
LexManos
74c3aab720 Fix FML entity network spawning not using EntityBuilder's facctory. Closes #4845 and #4846 2018-06-27 12:51:06 -07:00
LexManos
1007d3e9c5 Added Fluid Place Block Event for when fluid changes blocks in world. (#4627) 2018-06-27 12:06:55 -07:00
UnRealDinnerbone
c001d2dbf6 Add Farmland Trample Event (#4895) 2018-06-27 11:31:38 -07:00
Ben Staddon
539626727c Switch from trove to fastutil collections (#4933) 2018-06-27 11:29:09 -07:00
Ben Staddon
4d6fbd9d2f Clean up some dimension manager code and add a command to list dimensions (#4902) 2018-06-27 11:23:23 -07:00
Ben Staddon
a749861cb2 Change item model loading priority to fix model conflicts (#4898) 2018-06-27 11:08:38 -07:00
mezz
1db28d072a Improve server console implementation (#4821) 2018-06-27 10:58:07 -07:00
Ben Staddon
43895d773e Add validation to recipe registry (#4957) 2018-06-26 22:00:53 -07:00
Ben Staddon
f2d7a19702 Clear out stored errors after model loading finishes (#4938) 2018-06-24 00:18:13 -07:00
Paul Fulham
61666ed6aa Fix AutomaticEventSubscriber error message (#4986) 2018-06-23 23:38:57 -07:00
mezz
59c3e1baaf Always wrap mod creation errors in LoaderException 
to make error message more clear
 2018-06-23 12:33:42 -07:00
Ben Staddon
7258beeede Fix vertex lighter using stale normal data (#4917) 2018-06-20 12:36:10 -07:00
LexManos
9cda586ebd Fix scala mods crashing with the json annotation cache. 2018-06-01 00:07:17 -07:00
Ben Staddon
d9a042c775 Fix black flickering on animated models by clamping max diffuse lighting multiplier to 1.0 (#4962) 2018-05-31 22:35:02 -07:00
Ben Staddon
bea02348e2 Fix crash from search tree processing invalid recipes (#4942) 2018-05-26 19:56:46 -07:00
LexManos
b30540f20c Fix names in JSON annotation data not matching expected format. Closes #4953 2018-05-26 16:42:58 -07:00
LexManos
32438d2e00 Bump version in prep for new RB. 2018-05-24 18:38:01 -07:00
LexManos
b654b84393 Add potential support for models defining 'vanilla like' rotations in Forge's Modified Blockstate format. 2018-05-24 18:37:05 -07:00
Ben Staddon
0139a7baf2 Fix Forge bucket not declaring all texture dependencies (#4930) 2018-05-19 21:25:08 -07:00