6578d65cd8
Merge branch 'major-next' into inventory-rework
2024-12-06 12:58:03 +00:00
205aabe11f
Fixed merge error
2024-12-04 15:27:09 +00:00
007673cb96
Merge 'minor-next' into 'major-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12111121061
2024-12-02 01:41:02 +00:00
f1a3b42620
Implement frost walker enchantment ( #5497 )
...
Co-authored-by: Dylan T. <dktapps@pmmp.io >
2024-12-01 19:46:38 +00:00
f3763ae691
Implement Recovery compass ( #5502 )
...
Co-authored-by: Dylan K. Taylor <dktapps@pmmp.io >
2024-12-01 18:25:45 +00:00
12214792b3
Allow eating in creative & peaceful
...
closes #5923
closes #6056
2024-12-01 17:42:26 +00:00
a078f653f4
Merge 'minor-next' into 'major-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/12042121495
2024-11-27 01:39:13 +00:00
269effcecf
Introduce Utils::getRandomFloat() ( #6532 )
...
Drop-in replacement for lcg_value() for PHP 8.4
2024-11-26 11:33:29 +00:00
3099129272
Merge branch 'major-next' into inventory-rework
2024-11-25 14:38:56 +00:00
15eaf67a0c
Merge branch 'minor-next' into major-next
2024-11-25 14:36:25 +00:00
12ae8dc03b
Merge branch 'stable' into minor-next
2024-11-25 14:32:30 +00:00
5325ecee37
Deal with a whole lot of PHPStan suppressed key casting errors
...
closes #6534
2024-11-25 14:30:58 +00:00
5c221247fe
Merge branch 'major-next' into inventory-rework
2024-11-24 23:51:16 +00:00
e51903d7ea
Merge branch 'minor-next' into major-next
2024-11-24 23:51:07 +00:00
f98cebbd62
Separate hotbar from player inventory
...
this allows this functionality to be used with any type of inventory, and also makes it a little nicer to use in many cases.
2024-11-24 17:58:58 +00:00
a5f607138c
Implement Ice Bomb ( #5452 )
...
Co-authored-by: Dylan K. Taylor <dktapps@pmmp.io >
2024-11-24 15:01:26 +00:00
330bcd2423
Merge 'minor-next' into 'major-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11874902000
2024-11-17 01:39:53 +00:00
e77f2c5198
Implemented End Crystal ( #4715 )
...
Co-authored-by: Dylan T. <dktapps@pmmp.io >
2024-11-16 17:57:57 +00:00
ab5176baf9
Merge branch 'minor-next' into major-next
2024-11-14 23:16:44 +00:00
33a7b46329
Use reflection to locate BlockTypeIds and ItemTypeIds for VanillaBlocks/VanillaItems ( #6498 )
...
Use reflection to locate BlockTypeIds and ItemTypeIds for VanillaBlocks/VanillaItems
Since BlockTypeIds and ItemTypeIds are derived from VanillaBlocks and VanillaItems respectively anyway (they only exist to allow identifying blocks/items without having to create instances of them), this hack is probably OK, and reduces the chances of mistakes.
Previously it was explored to have these IDs generated by auto-incrementing in VanillaBlocks/Items and have the constants generated that way, but this proved to be too problematic because of unstable diffs no matter how we chose to sort the elements. See #6313 for previous research on the subject.
This is obviously not a desirable hack to keep long-term. In the future it will probably make sense to redesign VanillaBlocks like so:
enum VanillaBlocks { ... }
VanillaBlocks::STONE (the type ID)
VanillaBlocks::STONE->new() (to create a block)
However, more research is needed on this, as I'd prefer not to make block creation any more verbose.
2024-11-14 17:32:22 +00:00
9b58d35516
Implement Goat horns ( #5232 )
...
Co-authored-by: ipad54 <63200545+ipad54@users.noreply.github.com >
Co-authored-by: Dylan T. <dktapps@pmmp.io >
2024-11-14 13:57:07 +00:00
80b7f6aba4
Merge 'minor-next' into 'major-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11769186885
2024-11-10 22:56:09 +00:00
fa3529966f
Merge 'stable' into 'minor-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11769186885
2024-11-10 22:56:08 +00:00
05a9e9c76e
Implemented sound when drinking a potion ( #6444 )
2024-11-10 15:07:18 +00:00
231eec911f
Enchanted Golden Apple: Regeneration 5 => 2 matching Java ( #6445 )
2024-11-09 19:43:30 +00:00
1ef854f2d1
Merge 'minor-next' into 'major-next'
...
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/11392123557
2024-10-17 19:59:15 +00:00
f6e6f15c63
Implemented a proper way to handle items cooldown ( #6405 )
2024-09-25 13:28:17 -05:00
4e6b34f573
Implement new 1.21 copper blocks ( #6366 )
...
Added the following new blocks:
- All types of Copper Bulb
- All types of Copper Door
- All types of Copper Trapdoor
- All types of Chiseled Copper
- All types of Copper Grate
2024-09-24 21:25:10 -05:00
1ac08ea73b
Remove enchant properties that no longer exists on PM6 ( #6417 )
2024-08-10 08:51:06 -05:00
c9e8d382c5
Merge branch 'minor-next' of github.com:pmmp/PocketMine-MP into major-next
2024-08-09 13:33:07 +01:00
c4a2b6494d
Implement Aqua Affinity enchantment ( #6408 )
2024-08-06 09:12:47 -05:00
787afb6b00
Implement all new 1.21 tuff blocks ( #6391 )
2024-07-23 11:34:46 -05:00
ef9791eaed
Merge pull request #6397 from pmmp/stable
...
Merge branch 'stable' into minor-next
2024-07-10 18:56:52 +01:00
2ffc38c835
Implement campfire & soul campfire ( #4696 )
2024-07-07 15:01:34 -05:00
20f5741ed7
Bowl: Add fuel return value ( #6384 )
2024-07-05 17:41:22 -05:00
371eccd007
Make access modifier consistent with parent abstract class ( #6341 )
2024-05-07 12:02:50 +01:00
12179aa03a
Merge branch 'minor-next' into major-next
2024-05-06 15:42:49 +01:00
37322e0d50
Armor: only make sound when the item was equipped by player action
...
this ensures the greatest amount of consistency with vanilla.
in order to prevent the sounds being broadcasted on armor damage with the old method, we'd also have to sacrifice the sound when replacing one leather helmet with another, for example.
this approach minimizes the gameplay impact at the possible expense of plugins.
closes #6325
2024-04-08 14:05:47 +01:00
f799cfaba6
Implemented sound when equipping armor ( #6303 )
2024-03-25 14:15:54 +00:00
e781c64540
Merge branch 'minor-next' into major-next
2024-03-14 12:47:18 +00:00
920341668f
Implemented working Name tag ( #5209 )
2024-02-19 18:46:48 +00:00
644693ffee
Merge branch 'minor-next' into major-next
2024-02-12 11:55:36 +00:00
e77cd39316
ItemBlock: add a workaround for air items with a stack size bigger than 0
...
In the future we should look into making empty slots be represented by null or a different, special item type, instead of breaking the air block for this purpose.
closes #6185
closes #6016
2024-01-09 15:55:41 +00:00
4d337add7c
Merge branch 'minor-next' into major-next
2023-12-14 14:03:09 +00:00
d596dc571d
Fix pitcher pod wrongly registered as a block ( #6162 )
2023-11-27 14:46:20 +00:00
923c922960
Merge branch 'stable' into minor-next
2023-11-13 11:13:12 +00:00
c44758f36c
StringToItemParser: added pitcher_plant and pitcher_pod
...
it seems a bit weird to map pitcher_pod to PITCHER_CROP(). Perhaps this wasn't implemented correctly.
2023-11-10 15:26:02 +00:00
9d75c45bf5
Merge branch 'minor-next' into major-next
2023-11-09 18:06:06 +00:00
4103631bc1
Added Smithing Template items ( #6132 )
2023-11-09 14:25:49 +00:00
d565be93a8
Merge branch 'minor-next' into major-next
2023-10-24 11:57:30 +01:00
