1.16.3 - just mappings
This commit is contained in:
parent
86014001ba
commit
19f7e17f7d
8 changed files with 12 additions and 12 deletions
|
@ -1,4 +1,4 @@
|
||||||
minecraftVersion="1.16.2,Fabric"
|
minecraftVersion="1.16.3,Fabric"
|
||||||
name="TechReborn-1.16"
|
name="TechReborn-1.16"
|
||||||
curseID="233564"
|
curseID="233564"
|
||||||
github-repo="TechReborn/TechReborn"
|
github-repo="TechReborn/TechReborn"
|
||||||
|
|
|
@ -69,12 +69,12 @@ configurations.all {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft "com.mojang:minecraft:1.16.2"
|
minecraft "com.mojang:minecraft:1.16.3"
|
||||||
mappings "net.fabricmc:yarn:1.16.2+build.5:v2"
|
mappings "net.fabricmc:yarn:1.16.3+build.11:v2"
|
||||||
modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
|
modImplementation "net.fabricmc:fabric-loader:0.9.3+build.207"
|
||||||
|
|
||||||
//Fabric api
|
//Fabric api
|
||||||
modImplementation "net.fabricmc.fabric-api:fabric-api:0.17.2+build.396-1.16"
|
modImplementation "net.fabricmc.fabric-api:fabric-api:0.21.0+build.407-1.16"
|
||||||
|
|
||||||
optionalDependency ("me.shedaniel:RoughlyEnoughItems:5.2.3")
|
optionalDependency ("me.shedaniel:RoughlyEnoughItems:5.2.3")
|
||||||
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.0')
|
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.0')
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class DynamicBucketBakedModel extends BaseDynamicFluidBakedModel {
|
||||||
@Override
|
@Override
|
||||||
public Sprite getSprite() {
|
public Sprite getSprite() {
|
||||||
return MinecraftClient.getInstance()
|
return MinecraftClient.getInstance()
|
||||||
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEX)
|
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
|
||||||
.apply(new Identifier("minecraft:item/bucket"));
|
.apply(new Identifier("minecraft:item/bucket"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ public class DynamicCellBakedModel extends BaseDynamicFluidBakedModel {
|
||||||
@Override
|
@Override
|
||||||
public Sprite getSprite() {
|
public Sprite getSprite() {
|
||||||
return MinecraftClient.getInstance()
|
return MinecraftClient.getInstance()
|
||||||
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEX)
|
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
|
||||||
.apply(new Identifier("techreborn:item/cell_base"));
|
.apply(new Identifier("techreborn:item/cell_base"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
|
||||||
@Nullable
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public Identifier getTexture(EntityNukePrimed entityNukePrimed) {
|
public Identifier getTexture(EntityNukePrimed entityNukePrimed) {
|
||||||
return SpriteAtlasTexture.BLOCK_ATLAS_TEX;
|
return SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -387,7 +387,7 @@ public class ReiPlugin implements REIPluginV0 {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void drawFluid(MatrixStack matrixStack, Fluid fluid, int drawHeight, int x, int y, int width, int height) {
|
public void drawFluid(MatrixStack matrixStack, Fluid fluid, int drawHeight, int x, int y, int width, int height) {
|
||||||
MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
|
MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE);
|
||||||
y += height;
|
y += height;
|
||||||
final Sprite sprite = FluidRenderHandlerRegistry.INSTANCE.get(fluid).getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0];
|
final Sprite sprite = FluidRenderHandlerRegistry.INSTANCE.get(fluid).getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0];
|
||||||
int color = FluidRenderHandlerRegistry.INSTANCE.get(fluid).getFluidColor(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState());
|
int color = FluidRenderHandlerRegistry.INSTANCE.get(fluid).getFluidColor(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState());
|
||||||
|
|
|
@ -52,7 +52,7 @@ import net.minecraft.util.hit.HitResult;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
import net.minecraft.util.registry.Registry;
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.world.RayTraceContext;
|
import net.minecraft.world.RaycastContext;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.WorldAccess;
|
import net.minecraft.world.WorldAccess;
|
||||||
import org.apache.commons.lang3.Validate;
|
import org.apache.commons.lang3.Validate;
|
||||||
|
@ -169,7 +169,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo {
|
||||||
ItemStack stack = player.getStackInHand(hand);
|
ItemStack stack = player.getStackInHand(hand);
|
||||||
Fluid containedFluid = getFluid(stack);
|
Fluid containedFluid = getFluid(stack);
|
||||||
|
|
||||||
BlockHitResult hitResult = rayTrace(world, player, containedFluid == Fluids.EMPTY ? RayTraceContext.FluidHandling.SOURCE_ONLY : RayTraceContext.FluidHandling.NONE);
|
BlockHitResult hitResult = raycast(world, player, containedFluid == Fluids.EMPTY ? RaycastContext.FluidHandling.SOURCE_ONLY : RaycastContext.FluidHandling.NONE);
|
||||||
if (hitResult.getType() == HitResult.Type.MISS) {
|
if (hitResult.getType() == HitResult.Type.MISS) {
|
||||||
return TypedActionResult.pass(stack);
|
return TypedActionResult.pass(stack);
|
||||||
} else if (hitResult.getType() != HitResult.Type.BLOCK) {
|
} else if (hitResult.getType() != HitResult.Type.BLOCK) {
|
||||||
|
|
|
@ -102,7 +102,7 @@ public class ToolsUtil {
|
||||||
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
|
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
|
||||||
}
|
}
|
||||||
|
|
||||||
HitResult hitResult = playerIn.rayTrace(20D, 0F, false);
|
HitResult hitResult = playerIn.raycast(20D, 0F, false);
|
||||||
|
|
||||||
if (placeDummyBlocks) {
|
if (placeDummyBlocks) {
|
||||||
worldIn.setBlockState(pos, Blocks.AIR.getDefaultState());
|
worldIn.setBlockState(pos, Blocks.AIR.getDefaultState());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue