maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.16.3 - just mappings

Browse source
This commit is contained in:
modmuss50 2020-09-19 14:30:12 +01:00
parent 86014001ba
commit 19f7e17f7d
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.conf
View file

@ -1,4 +1,4 @@
minecraftVersion="1.16.2,Fabric"
minecraftVersion="1.16.3,Fabric"
name="TechReborn-1.16"
curseID="233564"
github-repo="TechReborn/TechReborn"

8
build.gradle
View file

@ -69,12 +69,12 @@ configurations.all {
}
dependencies {
minecraft "com.mojang:minecraft:1.16.2"
mappings "net.fabricmc:yarn:1.16.2+build.5:v2"
modImplementation "net.fabricmc:fabric-loader:0.9.1+build.205"
minecraft "com.mojang:minecraft:1.16.3"
mappings "net.fabricmc:yarn:1.16.3+build.11:v2"
modImplementation "net.fabricmc:fabric-loader:0.9.3+build.207"
//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")
disabledOptionalDependency ('com.github.emilyploszaj:trinkets:2.6.0')

2
src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
View file

@ -40,7 +40,7 @@ public class DynamicBucketBakedModel extends BaseDynamicFluidBakedModel {
@Override
public Sprite getSprite() {
return MinecraftClient.getInstance()
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEX)
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
.apply(new Identifier("minecraft:item/bucket"));
}

2
src/main/java/techreborn/client/render/DynamicCellBakedModel.java
View file

@ -55,7 +55,7 @@ public class DynamicCellBakedModel extends BaseDynamicFluidBakedModel {
@Override
public Sprite getSprite() {
return MinecraftClient.getInstance()
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEX)
.getSpriteAtlas(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE)
.apply(new Identifier("techreborn:item/cell_base"));
}

2
src/main/java/techreborn/client/render/entitys/NukeRenderer.java
View file

@ -51,7 +51,7 @@ public class NukeRenderer extends EntityRenderer<EntityNukePrimed> {
@Nullable
@Override
public Identifier getTexture(EntityNukePrimed entityNukePrimed) {
return SpriteAtlasTexture.BLOCK_ATLAS_TEX;
return SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE;
}
@Override

2
src/main/java/techreborn/compat/rei/ReiPlugin.java
View file

@ -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) {
MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE);
y += height;
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());

4
src/main/java/techreborn/items/DynamicCellItem.java
View file

@ -52,7 +52,7 @@ import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
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.WorldAccess;
import org.apache.commons.lang3.Validate;
@ -169,7 +169,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo {
ItemStack stack = player.getStackInHand(hand);
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) {
return TypedActionResult.pass(stack);
} else if (hitResult.getType() != HitResult.Type.BLOCK) {

2
src/main/java/techreborn/utils/ToolsUtil.java
View file

@ -102,7 +102,7 @@ public class ToolsUtil {
worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState());
}
HitResult hitResult = playerIn.rayTrace(20D, 0F, false);
HitResult hitResult = playerIn.raycast(20D, 0F, false);
if (placeDummyBlocks) {
worldIn.setBlockState(pos, Blocks.AIR.getDefaultState());