minecraft
/
SimpleMultipart
mirror of https://github.com/shadowfacts/SimpleMultipart.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update Fabric/Yarn

This commit is contained in:
Shadowfacts 2018-12-19 20:23:04 -05:00
parent aa1b254c59
commit f5c2d193a5
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -14,9 +14,9 @@ minecraft {
dependencies { dependencies {
minecraft "com.mojang:minecraft:18w50a" minecraft "com.mojang:minecraft:18w50a"
mappings "net.fabricmc:yarn:18w50a.9" mappings "net.fabricmc:yarn:18w50a.48"
modCompile "net.fabricmc:fabric-loader:0.2.0.70" modCompile "net.fabricmc:fabric-loader:0.2.0.71"
// Fabric API. This is technically optional, but you probably want it anyway. // Fabric API. This is technically optional, but you probably want it anyway.
modCompile "net.fabricmc:fabric:0.1.1.55" modCompile "net.fabricmc:fabric:0.1.1.58"
} }

2
src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainerBlock.java
View File

@ -54,7 +54,7 @@ public class MultipartContainerBlock extends Block implements BlockEntityProvide
VoxelShape shape = null; VoxelShape shape = null;
for (Map.Entry<MultipartSlot, MultipartState> e : container.getParts().entrySet()) { for (Map.Entry<MultipartSlot, MultipartState> e : container.getParts().entrySet()) {
VoxelShape partShape = e.getValue().getBoundingShape(e.getKey(), container); VoxelShape partShape = e.getValue().getBoundingShape(e.getKey(), container);
shape = shape == null ? partShape : VoxelShapes.method_1084(shape, partShape); shape = shape == null ? partShape : VoxelShapes.union(shape, partShape);
} }
return shape == null ? VoxelShapes.empty() : shape; return shape == null ? VoxelShapes.empty() : shape;
} }

2
src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainerEventHandler.java
View File

@ -21,7 +21,7 @@ public class MultipartContainerEventHandler {
} }
private static ActionResult handleBlockAttack(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) { private static ActionResult handleBlockAttack(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) {
if (world.isRemote || world.getBlockState(pos).getBlock() != SimpleMultipart.containerBlock) { if (world.isClient || world.getBlockState(pos).getBlock() != SimpleMultipart.containerBlock) {
return ActionResult.PASS; return ActionResult.PASS;
} }

8
src/main/java/net/shadowfacts/simplemultipart/mixin/client/MixinBlockRenderManager.java
View File

@ -3,7 +3,7 @@ package net.shadowfacts.simplemultipart.mixin.client;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.RenderTypeBlock; import net.minecraft.block.RenderTypeBlock;
import net.minecraft.client.render.VertexBuffer; import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.block.BlockRenderManager; import net.minecraft.client.render.block.BlockRenderManager;
import net.minecraft.client.render.block.BlockRenderer; import net.minecraft.client.render.block.BlockRenderer;
import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedModel;
@ -26,14 +26,12 @@ public abstract class MixinBlockRenderManager {
@Shadow @Shadow
private BlockRenderer renderer; private BlockRenderer renderer;
@Shadow
private Random field_4169;
@Shadow @Shadow
public abstract BakedModel getModel(BlockState var1); public abstract BakedModel getModel(BlockState var1);
@Inject(at = @At("HEAD"), method = "method_3355", cancellable = true) @Inject(at = @At("HEAD"), method = "tesselateBlock", cancellable = true)
public void method_3355(BlockState state, BlockPos pos, ExtendedBlockView world, VertexBuffer buffer, Random random, CallbackInfoReturnable<Boolean> info) { public void tesselateBlock(BlockState state, BlockPos pos, ExtendedBlockView world, BufferBuilder buffer, Random random, CallbackInfoReturnable<Boolean> info) {
Block block = state.getBlock(); Block block = state.getBlock();
if (state.getRenderType() == RenderTypeBlock.MODEL && block instanceof RenderStateProvider) { if (state.getRenderType() == RenderTypeBlock.MODEL && block instanceof RenderStateProvider) {
RenderStateProvider provider = (RenderStateProvider)block; RenderStateProvider provider = (RenderStateProvider)block;

2
src/test/java/net/shadowfacts/simplemultipart/test/TestMultipartModel.java
View File

@ -9,7 +9,7 @@ import net.minecraft.client.render.model.json.ModelElementFace;
import net.minecraft.client.render.model.json.ModelElementTexture; import net.minecraft.client.render.model.json.ModelElementTexture;
import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.Sprite;
import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.sortme.Vector3f; import net.minecraft.client.util.math.Vector3f;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;
import net.shadowfacts.simplemultipart.client.MultipartBakedModel; import net.shadowfacts.simplemultipart.client.MultipartBakedModel;
import net.shadowfacts.simplemultipart.multipart.MultipartSlot; import net.shadowfacts.simplemultipart.multipart.MultipartSlot;