Skip to content

Commit 9c1b001

Browse files
committed
Merge branch 'dev' for v2.0.1
2 parents f710b38 + 67d75ab commit 9c1b001

39 files changed

+1809
-576
lines changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ Due to the use of the new type annotations **Python 3.10+** is required!
1414
After getting a [server](https://papermc.io/) and [compatible plugin](https://github.com/mcpq/mcpq-plugin?tab=readme-ov-file#versions) setup and running, the only thing left to do is to install the python library:
1515

1616
```bash
17-
pip3 install mcpq
17+
pip install mcpq
1818
```
19+
> Some of the extra features in `mcpq.tools` need additional dependencies, if you want to use them install with: `pip install mcpq[tools]`
1920
2021
Get coding and checkout [the docs](https://mcpq.github.io/mcpq-python/) for more examples!
2122

@@ -78,7 +79,7 @@ TLDR; make sure the first 2 numbers (`major.minor`) of the library version are t
7879

7980
## Build Instructions
8081

81-
The library is currently [published on PyPI](https://pypi.org/project/mcpq/). The package can be downloaded from there with `pip3 install mcpq`.
82+
The library is currently [published on PyPI](https://pypi.org/project/mcpq/). The package can be downloaded from there with `pip install mcpq`.
8283

8384
You can also install this package directly by using `pip install git+https://github.com/mcpq/mcpq-python.git@<tag/branch>` to install it directly from Github (`git` is required for this).
8485
If you cloned the repository already then `pip install .` can be used.

docs/.buildinfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: b8059682c4e1415acd4cba45dc1e88d3
3+
config: d97094990600c85b31135c1b7a693a96
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_static/documentation_options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const DOCUMENTATION_OPTIONS = {
2-
VERSION: '2.0.0',
2+
VERSION: '2.0.1',
33
LANGUAGE: 'en',
44
COLLAPSE_INDEX: false,
55
BUILDER: 'html',

docs/classes/block.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

8-
<title>&lt;no title&gt; &#8212; MCPQ 2.0.0 documentation</title>
8+
<title>&lt;no title&gt; &#8212; MCPQ 2.0.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/agogo.css?v=8513425a" />
11-
<script src="../_static/documentation_options.js?v=51b770b3"></script>
11+
<script src="../_static/documentation_options.js?v=f5cff4aa"></script>
1212
<script src="../_static/doctools.js?v=9a2dae69"></script>
1313
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
1414
<link rel="index" title="Index" href="../genindex.html" />
@@ -19,7 +19,7 @@
1919
<div class="header-wrapper" role="banner">
2020
<div class="header">
2121
<div class="headertitle"><a
22-
href="../index.html">MCPQ 2.0.0 documentation</a></div>
22+
href="../index.html">MCPQ 2.0.1 documentation</a></div>
2323
<div class="rel" role="navigation" aria-label="Related">
2424
<a href="vec3.html" title="&lt;no title&gt;"
2525
accesskey="P">previous</a> |

docs/classes/entity.html

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

8-
<title>&lt;no title&gt; &#8212; MCPQ 2.0.0 documentation</title>
8+
<title>&lt;no title&gt; &#8212; MCPQ 2.0.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/agogo.css?v=8513425a" />
11-
<script src="../_static/documentation_options.js?v=51b770b3"></script>
11+
<script src="../_static/documentation_options.js?v=f5cff4aa"></script>
1212
<script src="../_static/doctools.js?v=9a2dae69"></script>
1313
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
1414
<link rel="index" title="Index" href="../genindex.html" />
@@ -19,7 +19,7 @@
1919
<div class="header-wrapper" role="banner">
2020
<div class="header">
2121
<div class="headertitle"><a
22-
href="../index.html">MCPQ 2.0.0 documentation</a></div>
22+
href="../index.html">MCPQ 2.0.1 documentation</a></div>
2323
<div class="rel" role="navigation" aria-label="Related">
2424
<a href="minecraft.html" title="&lt;no title&gt;"
2525
accesskey="P">previous</a> |
@@ -155,6 +155,17 @@
155155
</dl>
156156
</dd></dl>
157157

158+
<dl class="py method">
159+
<dt class="sig sig-object py" id="mcpq.entity.Entity.getNbt">
160+
<span class="sig-name descname"><span class="pre">getNbt</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><a class="reference internal" href="nbt.html#mcpq.nbt.NbtCompound" title="mcpq.nbt._types.NbtCompound"><span class="pre">NbtCompound</span></a><span class="w"> </span><span class="p"><span class="pre">|</span></span><span class="w"> </span><span class="pre">None</span></span></span><a class="headerlink" href="#mcpq.entity.Entity.getNbt" title="Link to this definition"></a></dt>
161+
<dd><p>Get the entity’s NBT data as <code class="xref py py-class docutils literal notranslate"><span class="pre">NBT</span></code> or None if the entity is not loaded. The data is not cached NBT data is always queried on call.</p>
162+
<div class="admonition caution">
163+
<p class="admonition-title">Caution</p>
164+
<p>This function requires command output captuing.
165+
The plugin that is built against the <code class="docutils literal notranslate"><span class="pre">spigot-Bukkit</span> <span class="pre">API</span></code> does <em>not</em> fully support the return of command output.</p>
166+
</div>
167+
</dd></dl>
168+
158169
<dl class="py method">
159170
<dt class="sig sig-object py" id="mcpq.entity.Entity.giveEffect">
160171
<span class="sig-name descname"><span class="pre">giveEffect</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">effect</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">str</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">seconds</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">int</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">amplifier</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">int</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">0</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">particles</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">bool</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">True</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">None</span></span></span><a class="headerlink" href="#mcpq.entity.Entity.giveEffect" title="Link to this definition"></a></dt>
@@ -322,6 +333,7 @@ <h3>Table of Contents</h3>
322333
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.facing"><code class="docutils literal notranslate"><span class="pre">Entity.facing</span></code></a></li>
323334
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.world"><code class="docutils literal notranslate"><span class="pre">Entity.world</span></code></a></li>
324335
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.getEntitiesAround"><code class="docutils literal notranslate"><span class="pre">Entity.getEntitiesAround()</span></code></a></li>
336+
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.getNbt"><code class="docutils literal notranslate"><span class="pre">Entity.getNbt()</span></code></a></li>
325337
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.giveEffect"><code class="docutils literal notranslate"><span class="pre">Entity.giveEffect()</span></code></a></li>
326338
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.kill"><code class="docutils literal notranslate"><span class="pre">Entity.kill()</span></code></a></li>
327339
<li class="toctree-l2"><a class="reference internal" href="#mcpq.entity.Entity.remove"><code class="docutils literal notranslate"><span class="pre">Entity.remove()</span></code></a></li>

docs/classes/events.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

8-
<title>Events &#8212; MCPQ 2.0.0 documentation</title>
8+
<title>Events &#8212; MCPQ 2.0.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/agogo.css?v=8513425a" />
11-
<script src="../_static/documentation_options.js?v=51b770b3"></script>
11+
<script src="../_static/documentation_options.js?v=f5cff4aa"></script>
1212
<script src="../_static/doctools.js?v=9a2dae69"></script>
1313
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
1414
<link rel="index" title="Index" href="../genindex.html" />
@@ -19,7 +19,7 @@
1919
<div class="header-wrapper" role="banner">
2020
<div class="header">
2121
<div class="headertitle"><a
22-
href="../index.html">MCPQ 2.0.0 documentation</a></div>
22+
href="../index.html">MCPQ 2.0.1 documentation</a></div>
2323
<div class="rel" role="navigation" aria-label="Related">
2424
<a href="world.html" title="&lt;no title&gt;"
2525
accesskey="P">previous</a> |

docs/classes/filter.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

8-
<title>Materials and Entity-Types &#8212; MCPQ 2.0.0 documentation</title>
8+
<title>Materials and Entity-Types &#8212; MCPQ 2.0.1 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=a746c00c" />
1010
<link rel="stylesheet" type="text/css" href="../_static/agogo.css?v=8513425a" />
11-
<script src="../_static/documentation_options.js?v=51b770b3"></script>
11+
<script src="../_static/documentation_options.js?v=f5cff4aa"></script>
1212
<script src="../_static/doctools.js?v=9a2dae69"></script>
1313
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
1414
<link rel="index" title="Index" href="../genindex.html" />
@@ -19,7 +19,7 @@
1919
<div class="header-wrapper" role="banner">
2020
<div class="header">
2121
<div class="headertitle"><a
22-
href="../index.html">MCPQ 2.0.0 documentation</a></div>
22+
href="../index.html">MCPQ 2.0.1 documentation</a></div>
2323
<div class="rel" role="navigation" aria-label="Related">
2424
<a href="events.html" title="Events"
2525
accesskey="P">previous</a> |
@@ -44,7 +44,7 @@ <h1>Materials and Entity-Types<a class="headerlink" href="#materials-and-entity-
4444
<dl class="py class">
4545
<dt class="sig sig-object py" id="mcpq.material.MaterialFilter">
4646
<em class="property"><span class="pre">class</span><span class="w"> </span></em><span class="sig-name descname"><span class="pre">MaterialFilter</span></span><a class="headerlink" href="#mcpq.material.MaterialFilter" title="Link to this definition"></a></dt>
47-
<dd><p>The <a class="reference internal" href="#mcpq.material.MaterialFilter" title="mcpq.material.MaterialFilter"><code class="xref py py-class docutils literal notranslate"><span class="pre">MaterialFilter</span></code></a> filteres materials, which includes types of blocks, items and other materials, by querying the server.
47+
<dd><p>The <a class="reference internal" href="#mcpq.material.MaterialFilter" title="mcpq.material.MaterialFilter"><code class="xref py py-class docutils literal notranslate"><span class="pre">MaterialFilter</span></code></a> filters materials, which includes types of blocks, items and other materials, by querying the server.
4848
The exact materials that are available depend on the Minecraft version and plugins/mods that are installed on the <code class="xref py py-class docutils literal notranslate"><span class="pre">Minecraft</span></code> instance.</p>
4949
<p>Typically, we would like to get a certain subtype of material, which can be filtered directly on this class. Once we have done this, we can iterate over it, return a list of applied filters or choose a random block from the filtered materials:</p>
5050
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">mcpq</span> <span class="kn">import</span> <span class="n">Minecraft</span>
@@ -76,7 +76,7 @@ <h1>Materials and Entity-Types<a class="headerlink" href="#materials-and-entity-
7676
<span class="n">wool_list</span> <span class="o">=</span> <span class="n">mc</span><span class="o">.</span><span class="n">blocks</span><span class="o">.</span><span class="n">contains</span><span class="p">(</span><span class="s2">&quot;wool&quot;</span><span class="p">)</span><span class="o">.</span><span class="n">get</span><span class="p">()</span>
7777
</pre></div>
7878
</div>
79-
<p>Most filteres can be inverted, either directly, e.g., <code class="docutils literal notranslate"><span class="pre">mc.materials.item(False)</span></code> to get all non-item materials, or by using the inverted keyword for string filters, e.g., <code class="docutils literal notranslate"><span class="pre">mc.materials.contains(&quot;yellow&quot;,</span> <span class="pre">&quot;orange&quot;,</span> <span class="pre">negate=True)</span></code> to get all materials that do not contain the words yellow or orange.</p>
79+
<p>Most filters can be inverted, either directly, e.g., <code class="docutils literal notranslate"><span class="pre">mc.materials.item(False)</span></code> to get all non-item materials, or by using the inverted keyword for string filters, e.g., <code class="docutils literal notranslate"><span class="pre">mc.materials.contains(&quot;yellow&quot;,</span> <span class="pre">&quot;orange&quot;,</span> <span class="pre">negate=True)</span></code> to get all materials that do not contain the words yellow or orange.</p>
8080
<p>Additionally, filters can be combined in a number of ways.
8181
Let’s say we want to get all block types that contain the words “wool” or “concrete” but NOT the word “yellow”. There are multiple ways how we could filter the material list:</p>
8282
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">mcpq</span> <span class="kn">import</span> <span class="n">Minecraft</span>
@@ -253,8 +253,8 @@ <h1>Materials and Entity-Types<a class="headerlink" href="#materials-and-entity-
253253
<dd><p>Works the same as <a class="reference internal" href="#mcpq.material.MaterialFilter" title="mcpq.material.MaterialFilter"><code class="xref py py-class docutils literal notranslate"><span class="pre">MaterialFilter</span></code></a> only for entity-types instead.</p>
254254
<div class="admonition note">
255255
<p class="admonition-title">Note</p>
256-
<p>The interface and functions for entities is very similar to blocks, such that we are aliasing <a class="reference internal" href="block.html#mcpq.nbt.EntityType" title="mcpq.nbt.EntityType"><code class="xref py py-class docutils literal notranslate"><span class="pre">EntityType</span></code></a> to <a class="reference internal" href="block.html#mcpq.nbt.Block" title="mcpq.nbt.Block"><code class="xref py py-class docutils literal notranslate"><span class="pre">Block</span></code></a> at the moment.
257-
If at a later point the functionality between the two diverges then we will split the classes as well.</p>
256+
<p>The interface and functions for entities is very similar to blocks, such that <a class="reference internal" href="block.html#mcpq.nbt.EntityType" title="mcpq.nbt.EntityType"><code class="xref py py-class docutils literal notranslate"><span class="pre">EntityType</span></code></a> is aliased to <a class="reference internal" href="block.html#mcpq.nbt.Block" title="mcpq.nbt.Block"><code class="xref py py-class docutils literal notranslate"><span class="pre">Block</span></code></a> at the moment.
257+
If at a later point the functionality between the two diverges then the classes will split up.</p>
258258
</div>
259259
<dl class="py property">
260260
<dt class="sig sig-object py" id="mcpq.entitytype.EntityTypeFilter.or_">

0 commit comments

Comments
 (0)