infiniteserver/fabric
1
0
Fork 0
forked from FabricMC/fabric
Code Pull requests Activity

Fix checkstyle package check using client/server as the module name and missing suffix validation, adapt missed fabric-renderer-registry package

Browse source
This commit is contained in:
Player 2019-11-27 13:22:50 +01:00
parent 2775144ad8
commit 5a0f9a60f7
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
checkstyle.xml
View file

@ -170,7 +170,7 @@
- net.fabricmc.fabric.(impl|mixin).server.<module-name>[.<extra packages...>]
- net.fabricmc.fabric.(impl|mixin).<module-name>[.<extra packages...>]
- <any legacy package>
where <module-name> is a set of '.'-separated words, all in singular (not ending with s)
where <module-name> is a set of '.'-separated words, all in singular (not ending with s) and not starting with client. or server.
and <version> is a positive integer (1, 2, 3, ...)
and <extra packages...> is a set of '.'-separated words with all the first potentially containing digits.
Negative lookahead ensures that client/server can't be replaced with common disguised as the module name.
@ -184,7 +184,7 @@
- largely unconstained trailing subpackages
-->
<property name="format"
value="^net\.fabricmc\.fabric\.(api(?!\.common\.)(\.client|\.server|)(\.[a-z]+[a-rt-z])+\.v[1-9][0-9]*|(impl|mixin)(?!\.common\.)(\.client|\.server|)(\.[a-z]+[a-rt-z])+|api\.(event|util|biomes\.v1|registry|client\.screen|container|block|entity|client\.itemgroup|client\.keybinding|tag|tools|client\.model|network|server|client\.render|resource|client\.texture))(|\.[a-z]+(\.[a-z0-9]+)*)$"/>
value="^net\.fabricmc\.fabric\.(api(?!\.common\.)(\.client|\.server|)(\.(?!client\.|server\.)[a-z]+[a-rt-z])+\.v[1-9][0-9]*|(impl|mixin)(?!\.common\.)(\.client|\.server|)(\.(?!client\.|server\.)[a-z]+[a-rt-z])+|api\.(event|util|biomes\.v1|registry|client\.screen|container|block|entity|client\.itemgroup|client\.keybinding|tag|tools|client\.model|network|server|client\.render|resource|client\.texture))(|\.[a-z]+(\.[a-z0-9]+)*)$"/>
</module>
<!--<module name="InvalidJavadocPosition"/>-->

2
fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/api/client/rendereregistry/v1/BlockEntityRendererRegistry.java
View file

@ -23,7 +23,7 @@ import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.fabricmc.fabric.impl.client.rendereregistry.v1.BlockEntityRendererRegistryImpl;
import net.fabricmc.fabric.impl.client.renderer.registry.BlockEntityRendererRegistryImpl;
/**
* Helper class for registering BlockEntityRenderers.

2
fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/impl/client/rendereregistry/v1/BlockEntityRendererRegistryImpl.java → fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/impl/client/renderer/registry/BlockEntityRendererRegistryImpl.java
View file

@ -14,7 +14,7 @@
* limitations under the License.
*/
package net.fabricmc.fabric.impl.client.rendereregistry.v1;
package net.fabricmc.fabric.impl.client.renderer.registry;
import java.util.HashMap;
import java.util.function.BiConsumer;

2
fabric-renderer-registries-v1/src/main/java/net/fabricmc/fabric/mixin/client/renderer/registry/MixinBlockEntityRenderDispatcher.java
View file

@ -29,7 +29,7 @@ import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
import net.fabricmc.fabric.impl.client.rendereregistry.v1.BlockEntityRendererRegistryImpl;
import net.fabricmc.fabric.impl.client.renderer.registry.BlockEntityRendererRegistryImpl;
@Mixin(BlockEntityRenderDispatcher.class)
public abstract class MixinBlockEntityRenderDispatcher {