Skip to content

Commit

Permalink
we do a little bit of tarping
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cibernet83
Cibernet83 committed Apr 1, 2023
1 parent 4390dcd commit d1a1619
Show file tree
Hide file tree
Showing 183 changed files with 2,617 additions and 24,034 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mappings_channel = official
mappings_version = 1.16.5

# mod properties
mod_version=3.1.1
mod_version=3.1.2
maven_group=net.splatcraft.forge
archives_base_name=splatcraft

Expand Down
13 changes: 8 additions & 5 deletions src/main/java/net/splatcraft/forge/blocks/TarpBlock.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package net.splatcraft.forge.blocks;

import com.google.common.collect.ImmutableMap;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.IWaterLoggable;
import net.minecraft.block.SixWayBlock;
import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState;
Expand All @@ -24,13 +21,14 @@
import net.minecraft.util.math.shapes.VoxelShapes;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

public class TarpBlock extends Block implements IWaterLoggable
public class TarpBlock extends AbstractGlassBlock implements IWaterLoggable
{

public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED;
Expand All @@ -56,6 +54,11 @@ public TarpBlock()
this.stateToShapeMap = ImmutableMap.copyOf(this.getStateDefinition().getPossibleStates().stream().collect(Collectors.toMap(Function.identity(), TarpBlock::getShapeForState)));
}

@Override
public VoxelShape getOcclusionShape(BlockState p_196247_1_, IBlockReader p_196247_2_, BlockPos p_196247_3_) {
return VoxelShapes.empty();
}

@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder) {
builder.add(UP, DOWN, NORTH, SOUTH, WEST, EAST, WATERLOGGED);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/net/splatcraft/forge/client/layer/InkSquidColorLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import net.splatcraft.forge.Splatcraft;
import net.splatcraft.forge.SplatcraftConfig;
import net.splatcraft.forge.client.model.InkSquidModel;
import net.splatcraft.forge.client.model.TarpSquidModel;
import net.splatcraft.forge.util.ColorUtils;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
Expand All @@ -11,12 +11,12 @@
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.ResourceLocation;

public class InkSquidColorLayer extends LayerRenderer<LivingEntity, InkSquidModel>
public class InkSquidColorLayer extends LayerRenderer<LivingEntity, TarpSquidModel>
{
private static final ResourceLocation TEXTURE = new ResourceLocation(Splatcraft.MODID, "textures/entity/ink_squid.png");
private final InkSquidModel MODEL = new InkSquidModel();
private final TarpSquidModel MODEL = new TarpSquidModel();

public InkSquidColorLayer(IEntityRenderer<LivingEntity, InkSquidModel> renderer)
public InkSquidColorLayer(IEntityRenderer<LivingEntity, TarpSquidModel> renderer)
{
super(renderer);
}
Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/splatcraft/forge/client/model/InkSquidModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import net.minecraft.util.math.MathHelper;
import net.splatcraft.forge.data.capabilities.inkoverlay.IInkOverlayInfo;
import net.splatcraft.forge.data.capabilities.inkoverlay.InkOverlayCapability;
import net.splatcraft.forge.handlers.SquidFormHandler;

public class InkSquidModel extends EntityModel<LivingEntity>
{
Expand Down
40 changes: 40 additions & 0 deletions src/main/java/net/splatcraft/forge/client/model/TarpSquidModel.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package net.splatcraft.forge.client.model;// Made with Blockbench 3.5.4
// Exported for Minecraft version 1.15
// Paste this class into your mod and generate all required imports


import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.entity.model.EntityModel;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.minecraft.entity.LivingEntity;

public class TarpSquidModel extends EntityModel<LivingEntity>
{
private final ModelRenderer bb_main;

public TarpSquidModel() {
texWidth = 64;
texHeight = 64;

bb_main = new ModelRenderer(this);
bb_main.setPos(0.0F, 24.0F, 0.0F);
bb_main.texOffs(0, 0).addBox(-8.0F, -1.0F, -8.0F, 16.0F, 1.0F, 16.0F, 0.0F, false);
}

@Override
public void setupAnim(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
//previously the render function, render code was moved to a method below
}

@Override
public void renderToBuffer(MatrixStack matrixStack, IVertexBuilder buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
bb_main.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
}

public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.xRot = x;
modelRenderer.yRot = y;
modelRenderer.zRot = z;
}
}
24 changes: 8 additions & 16 deletions src/main/java/net/splatcraft/forge/client/model/subs/BurstBombModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,32 @@
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 3.8.3
// Exported for Minecraft version 1.15 - 1.16
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 4.6.5
// Exported for Minecraft version 1.15 - 1.16 with Mojang mappings
// Paste this class into your mod and generate all required imports


import net.splatcraft.forge.entities.subs.BurstBombEntity;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.splatcraft.forge.entities.subs.BurstBombEntity;

public class BurstBombModel extends AbstractSubWeaponModel<BurstBombEntity>
{
public class BurstBombModel extends AbstractSubWeaponModel<BurstBombEntity> {
private final ModelRenderer bone;

public BurstBombModel()
{
public BurstBombModel() {
texWidth = 32;
texHeight = 32;

bone = new ModelRenderer(this);
bone.setPos(0.0F, 0F, 0.0F);
bone.texOffs(0, 0).addBox(-3.0F, -2.5F, -3.0F, 6.0F, 5.0F, 6.0F, 0.0F, false);
bone.texOffs(12, 12).addBox(-2.0F, -3.5F, -2.0F, 4.0F, 1.0F, 4.0F, 0.0F, false);
bone.texOffs(0, 11).addBox(-2.0F, 2.5F, -2.0F, 4.0F, 1.0F, 4.0F, 0.0F, false);
bone.texOffs(0, 16).addBox(-1.5F, -5.5F, -1.5F, 3.0F, 1.0F, 3.0F, 0.0F, false);
bone.texOffs(12, 17).addBox(-1.0F, -4.5F, -1.0F, 2.0F, 1.0F, 2.0F, 0.0F, false);
bone.texOffs(0, 0).addBox(-4.0F, -4.5F, -4.0F, 8.0F, 8.0F, 8.0F, 0.0F, false);
}


@Override
public void setupAnim(BurstBombEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
//previously the render function, render code was moved to a method below
}

@Override
public void renderToBuffer(MatrixStack matrixStack, IVertexBuilder buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha)
{
public void renderToBuffer(MatrixStack matrixStack, IVertexBuilder buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
bone.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
}

Expand All @@ -43,4 +35,4 @@ public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, floa
modelRenderer.yRot = y;
modelRenderer.zRot = z;
}
}
}
138 changes: 21 additions & 117 deletions src/main/java/net/splatcraft/forge/client/model/subs/CurlingBombModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,62 @@
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 4.6.4
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 4.6.5
// Exported for Minecraft version 1.15 - 1.16 with Mojang mappings
// Paste this class into your mod and generate all required imports


import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.minecraft.util.math.MathHelper;
import net.splatcraft.forge.entities.subs.CurlingBombEntity;

public class CurlingBombModel extends AbstractSubWeaponModel<CurlingBombEntity> {
private final ModelRenderer blades;
private final ModelRenderer bone3;
private final ModelRenderer top;
private final ModelRenderer handle;
private final ModelRenderer cube_r1;
private final ModelRenderer bone2;
private final ModelRenderer cube_r2;
private final ModelRenderer bone4;
private final ModelRenderer cube_r3;
private final ModelRenderer bumper1;
private final ModelRenderer bumper2;
private final ModelRenderer bumper3;
private final ModelRenderer bumper4;
private final ModelRenderer top;
private final ModelRenderer handle;
private final ModelRenderer cube_r4;
private final ModelRenderer cube_r5;
private final ModelRenderer cube_r6;
private final ModelRenderer bb_main;

public CurlingBombModel() {
texWidth = 64;
texHeight = 64;

blades = new ModelRenderer(this);
blades.setPos(0.0F, 24.05F, 0.0F);
blades.texOffs(26, 27).addBox(-1.0F, -2.0F, -1.0F, 2.0F, 1.0F, 2.0F, 0.0F, false);

bone3 = new ModelRenderer(this);
bone3.setPos(0.0F, 0.0F, 0.0F);
blades.addChild(bone3);


cube_r1 = new ModelRenderer(this);
cube_r1.setPos(0.0F, -1.3F, 1.0F);
bone3.addChild(cube_r1);
setRotationAngle(cube_r1, 0.0F, 0.0F, 0.4363F);
cube_r1.texOffs(2, 0).addBox(-0.5F, 0.0F, -0.3F, 1.0F, 0.0F, 3.0F, 0.0F, false);

bone2 = new ModelRenderer(this);
bone2.setPos(0.0F, 0.0F, 0.0F);
blades.addChild(bone2);
setRotationAngle(bone2, 0.0F, 2.0944F, 0.0F);


cube_r2 = new ModelRenderer(this);
cube_r2.setPos(0.0F, -1.3F, 1.0F);
bone2.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 0.0F, 0.4363F);
cube_r2.texOffs(2, 0).addBox(-0.5F, 0.0F, -0.3F, 1.0F, 0.0F, 3.0F, 0.0F, false);

bone4 = new ModelRenderer(this);
bone4.setPos(0.0F, 0.0F, 0.0F);
blades.addChild(bone4);
setRotationAngle(bone4, 0.0F, -2.0944F, 0.0F);


cube_r3 = new ModelRenderer(this);
cube_r3.setPos(0.0F, -1.3F, 1.0F);
bone4.addChild(cube_r3);
setRotationAngle(cube_r3, 0.0F, 0.0F, 0.4363F);
cube_r3.texOffs(2, 0).addBox(-0.5F, 0.0F, -0.3F, 1.0F, 0.0F, 3.0F, 0.0F, false);

bumper1 = new ModelRenderer(this);
bumper1.setPos(0.0F, 24.0F, 0.0F);
setRotationAngle(bumper1, 0.0F, -1.5708F, 0.0F);
bumper1.texOffs(24, 0).addBox(-3.5F, -4.5F, -5.0F, 7.0F, 3.0F, 1.0F, 0.0F, false);
bumper1.texOffs(0, 13).addBox(-0.5F, -3.5F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);

bumper2 = new ModelRenderer(this);
bumper2.setPos(0.0F, 24.0F, 0.0F);
setRotationAngle(bumper2, 0.0F, 3.1416F, 0.0F);
bumper2.texOffs(24, 0).addBox(-3.5F, -4.5F, -5.0F, 7.0F, 3.0F, 1.0F, 0.0F, false);
bumper2.texOffs(0, 13).addBox(-0.5F, -3.5F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);

bumper3 = new ModelRenderer(this);
bumper3.setPos(0.0F, 24.0F, 0.0F);
bumper3.texOffs(24, 0).addBox(-3.5F, -4.5F, -5.0F, 7.0F, 3.0F, 1.0F, 0.0F, false);
bumper3.texOffs(0, 13).addBox(-0.5F, -3.5F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);

bumper4 = new ModelRenderer(this);
bumper4.setPos(0.0F, 24.0F, 0.0F);
setRotationAngle(bumper4, 0.0F, 1.5708F, 0.0F);
bumper4.texOffs(24, 0).addBox(-3.5F, -4.5F, -5.0F, 7.0F, 3.0F, 1.0F, 0.0F, false);
bumper4.texOffs(0, 13).addBox(-0.5F, -3.5F, -4.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);

top = new ModelRenderer(this);
top.setPos(0.0F, 20.0F, 0.0F);
top.texOffs(0, 9).addBox(-3.5F, -0.6F, -3.5F, 7.0F, 3.0F, 7.0F, -0.05F, false);
top.setPos(0.0F, 23.0F, 0.0F);
top.texOffs(0, 55).addBox(-4.0F, -0.4F, -4.0F, 8.0F, 1.0F, 8.0F, -0.05F, false);

handle = new ModelRenderer(this);
handle.setPos(2.5346F, -2.6775F, 0.0F);
top.addChild(handle);
handle.texOffs(0, 19).addBox(-3.5346F, 0.2775F, -1.0F, 1.0F, 2.0F, 2.0F, 0.0F, false);
handle.texOffs(21, 13).addBox(-3.5346F, -0.6225F, -1.0F, 5.0F, 1.0F, 2.0F, 0.001F, false);

cube_r4 = new ModelRenderer(this);
cube_r4.setPos(0.0F, 0.0F, 0.0F);
handle.addChild(cube_r4);
setRotationAngle(cube_r4, 0.0F, 0.0F, 0.3847F);
cube_r4.texOffs(22, 29).addBox(-1.2F, -0.2F, -1.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);
cube_r4.texOffs(21, 23).addBox(-1.5F, -0.2F, -1.0F, 3.0F, 1.0F, 2.0F, 0.0F, false);

cube_r5 = new ModelRenderer(this);
cube_r5.setPos(-2.8783F, 2.1816F, 0.0F);
handle.addChild(cube_r5);
setRotationAngle(cube_r5, 0.0F, 0.0F, 0.2182F);
cube_r5.texOffs(6, 29).addBox(-0.925F, -2.25F, -1.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);
cube_r1 = new ModelRenderer(this);
cube_r1.setPos(0.0F, 0.0F, 0.0F);
handle.addChild(cube_r1);
setRotationAngle(cube_r1, 0.0F, 0.0F, 0.3847F);
cube_r1.texOffs(22, 29).addBox(-1.2F, -0.2F, -1.0F, 1.0F, 1.0F, 2.0F, 0.0F, false);
cube_r1.texOffs(21, 23).addBox(-1.5F, -0.2F, -1.0F, 3.0F, 1.0F, 2.0F, 0.0F, false);

cube_r6 = new ModelRenderer(this);
cube_r6.setPos(-2.3706F, 2.0834F, 0.0F);
handle.addChild(cube_r6);
setRotationAngle(cube_r6, 0.0F, 0.0F, -0.6109F);
cube_r6.texOffs(0, 9).addBox(-0.5F, -1.0F, -1.0F, 1.0F, 2.0F, 2.0F, 0.0F, false);
cube_r2 = new ModelRenderer(this);
cube_r2.setPos(-2.8783F, 2.1816F, 0.0F);
handle.addChild(cube_r2);
setRotationAngle(cube_r2, 0.0F, 0.0F, 0.2182F);
cube_r2.texOffs(6, 29).addBox(-0.925F, -2.25F, -1.0F, 1.0F, 1.0F, 2.0F, -0.001F, false);

bb_main = new ModelRenderer(this);
bb_main.setPos(0.0F, 24.0F, 0.0F);
bb_main.texOffs(0, 0).addBox(-4.0F, -1.0F, -4.0F, 8.0F, 1.0F, 8.0F, 0.0F, false);
bb_main.texOffs(0, 19).addBox(-3.5F, -4.5F, -3.5F, 7.0F, 3.0F, 7.0F, 0.0F, false);
cube_r3 = new ModelRenderer(this);
cube_r3.setPos(-2.3706F, 2.0834F, 0.0F);
handle.addChild(cube_r3);
setRotationAngle(cube_r3, 0.0F, 0.0F, -0.6109F);
cube_r3.texOffs(0, 9).addBox(-0.5F, -1.0F, -1.0F, 1.0F, 2.0F, 2.0F, 0.0F, false);
}

@Override
public void setupAnim(CurlingBombEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch){
//previously the render function, render code was moved to a method below
}

@Override
public void prepareMobModel(CurlingBombEntity entityIn, float limbSwing, float limbSwingAmount, float partialTick)
{
super.prepareMobModel(entityIn, limbSwing, limbSwingAmount, partialTick);

blades.yRot = MathHelper.lerp(partialTick, entityIn.prevBladeRot, entityIn.bladeRot);

top.y = 20 - MathHelper.clamp(30-MathHelper.lerp(partialTick, entityIn.prevFuseTime, entityIn.fuseTime), 0, .95f) * 3f;
}

@Override
public void renderToBuffer(MatrixStack matrixStack, IVertexBuilder buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
blades.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
bumper1.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
bumper2.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
bumper3.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
bumper4.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
top.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
bb_main.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
}

public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) {
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/net/splatcraft/forge/client/model/subs/SuctionBombModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 3.8.4
// Exported for Minecraft version 1.15 - 1.16
package net.splatcraft.forge.client.model.subs;// Made with Blockbench 4.6.5
// Exported for Minecraft version 1.15 - 1.16 with Mojang mappings
// Paste this class into your mod and generate all required imports


import net.splatcraft.forge.entities.subs.SuctionBombEntity;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.minecraft.util.math.MathHelper;
import net.splatcraft.forge.entities.subs.SuctionBombEntity;

public class SuctionBombModel extends AbstractSubWeaponModel<SuctionBombEntity> {
private final ModelRenderer Main;
Expand All @@ -32,9 +32,9 @@ public SuctionBombModel() {
Top = new ModelRenderer(this);
Top.setPos(0.0F, -2.5F, 0.0F);
Neck.addChild(Top);
Top.texOffs(0, 0).addBox(-2.0F, -7.7F, -2.0F, 4.0F, 6.0F, 4.0F, 0.0F, false);
Top.texOffs(12, 0).addBox(-1.5F, -1.7F, -1.5F, 3.0F, 1.0F, 3.0F, 0.0F, false);
Top.texOffs(0, 0).addBox(-0.5F, -1.2F, -0.5F, 1.0F, 2.0F, 1.0F, -0.1F, false);
Top.texOffs(0, 23).addBox(-4.0F, -2.65F, -4.0F, 8.0F, 1.0F, 8.0F, -0.05F, false);
}

@Override
Expand Down Expand Up @@ -70,4 +70,4 @@ public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, floa
modelRenderer.yRot = y;
modelRenderer.zRot = z;
}
}
}
Loading

0 comments on commit d1a1619

Please sign in to comment.