Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TeamMidnightDust/Nauticality
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.0
Choose a base ref
...
head repository: TeamMidnightDust/Nauticality
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Jul 3, 2021

  1. Update README.md

    Motschen authored Jul 3, 2021
    Copy the full SHA
    49aeac0 View commit details
  2. Update README.md

    Motschen authored Jul 3, 2021
    Copy the full SHA
    7a33ed2 View commit details

Commits on Jul 7, 2021

  1. Disable unfinished code

    Fixes #1
    Motschen committed Jul 7, 2021
    Copy the full SHA
    46696cd View commit details
  2. Bump version

    Motschen committed Jul 7, 2021
    Copy the full SHA
    c094f05 View commit details

Commits on Aug 2, 2021

  1. Copy the full SHA
    be27f1a View commit details
Showing with 19 additions and 5 deletions.
  1. +15 −2 README.md
  2. +1 −1 gradle.properties
  3. +3 −2 src/main/java/eu/midnightdust/nauticality/entity/client/renderer/SubmarineRenderer.java
17 changes: 15 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
# Nauticality
Explore the oceans with submarines, fight against pirates and watch the beautiful glow fish!


<div align="center"> <h1>Nauticality</h1>

Explore the oceans with submarines, fight against pirates and watch the beautiful glow fish!

Nauticality is TeamMidnightDust's submission for ModFest 1.17: BGDC
The mod is focused on enhancing ocean exploration with new blocks, mobs, vehicles and structures.
Use the new submarine to view the beautiful glow fish and loot pirate ships that spawn throughout the minecraft world.


![Submarine](https://media.discordapp.net/attachments/851900313409552394/860898179355508766/2021-07-03_11.45.40.png)
![Pirate Ship](https://media.discordapp.net/attachments/808287286022242314/860900982636019772/2021-06-20_19.07.25.png)
![Swamp](https://media.discordapp.net/attachments/808287286022242314/860901834469539840/2021-07-03_17.16.22.png)
</div>
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G
loader_version=0.11.6

# Mod Properties
mod_version = 0.1.0
mod_version = 0.1.2
maven_group = eu.midnightdust
archives_base_name = nauticality

Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
import eu.midnightdust.nauticality.entity.client.model.SubmarineModel;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderer;
@@ -37,13 +38,13 @@ public void render(SubmarineEntity entity, float yaw, float tickDelta, MatrixSta
matrixStack.push();
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180F - yaw));
matrixStack.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(180F));
matrixStack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion((yaw - entity.prevRoll)*8));
//matrixStack.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion((yaw - entity.prevRoll)*8));
entity.prevRoll = yaw;
matrixStack.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(180.0F + pitch));
matrixStack.translate(0.0D , -1.75D, -0.5D + (90 + entity.getPitch()) * 0.01f);
matrixStack.scale(1.2f,1.2f,1.2f);
model.setAngles(entity,tickDelta,0,0,yaw,entity.getPitch());
model.render(matrixStack, vertexConsumers.getBuffer(RenderLayer.getEntityCutout(getTexture(entity))), light, 1,1f,1f,1f,1f);
model.render(matrixStack, vertexConsumers.getBuffer(RenderLayer.getEntityCutout(getTexture(entity))), light, OverlayTexture.DEFAULT_UV,1f,1f,1f,1f);
overlay.render(matrixStack,vertexConsumers,light,entity,yaw,0f,tickDelta,0f,yaw,entity.getPitch());
matrixStack.pop();
}