Skip to content

Commit

Permalink
build with neoforge 20.2.86
Browse files Browse the repository at this point in the history
  • Loading branch information
desht committed Dec 4, 2023
1 parent 532c113 commit f0cbfe0
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 14 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ jobs:
with:
arguments: publishMavenPublicationToModmavenRepository --no-daemon
- name: Discord notification
uses: Ilshidur/action-discord@master
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
if:
env.DISCORD_WEBHOOK != null
uses: gradle/gradle-build-action@v2
with:
args: 'Build complete for project {{ EVENT_PAYLOAD.repository.full_name }} (Minecraft ${{ steps.mod_meta.outputs.mc_version}}): ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.'
arguments: announceDiscordBuild
# uses: Ilshidur/action-discord@master
# env:
# DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
# if:
# env.DISCORD_WEBHOOK != null
# with:
# args: 'Build complete for project {{ EVENT_PAYLOAD.repository.full_name }} (Minecraft ${{ steps.mod_meta.outputs.mc_version}}): ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.'
14 changes: 10 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ publishMods {
minecraftVersions.add(minecraft_version)
projectSlug = "modular-routers"
announcementTitle = "Download from Curseforge"
optional {
slug = "patchouli"
}
// optional {
// slug = "patchouli"
// }
}

modrinth {
Expand All @@ -229,7 +229,13 @@ publishMods {
// }
}

discord {
discord("announceDiscordBuild") {
webhookUrl = providers.environmentVariable("DISCORD_WEBHOOK").orElse("dryrun")
content = "A dev build of Modular Routers has been uploaded"
// setPlatforms(platforms.curseforge, platforms.modrinth)
}

discord("announceDiscordRelease") {
webhookUrl = providers.environmentVariable("DISCORD_WEBHOOK").orElse("dryrun")
content = changelog.map { "# A new version of Modular Routers has been released! \n" + it}
// setPlatforms(platforms.curseforge, platforms.modrinth)
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ curse_project_id=250294
# Minecraft/Forge
minecraft_version=1.20.2
minecraft_version_range=[1.20.2,)
neo_version=20.2.71-beta
neo_version_range=[20.2.71-beta,)
neo_version=20.2.86
neo_version_range=[20.2.86,)
loader_version_range=[1,)
mappings_channel=parchment
mappings_version=1.20.2-2023.10.22
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -892,10 +892,9 @@ public void setUpgradesFrom(IItemHandler handler) {
compileUpgrades();
}

@Override
public AABB getRenderBoundingBox() {
if (cachedRenderAABB == null) {
cachedRenderAABB = super.getRenderBoundingBox();
cachedRenderAABB = new AABB(getBlockPos());
beams.forEach(beam -> cachedRenderAABB = cachedRenderAABB.minmax(beam.getAABB(getBlockPos())));
}
return cachedRenderAABB;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.joml.Matrix4f;
Expand All @@ -36,6 +37,11 @@ public class ModularRouterBER implements BlockEntityRenderer<ModularRouterBlockE
public ModularRouterBER(BlockEntityRendererProvider.Context ctx) {
}

@Override
public AABB getRenderBoundingBox(ModularRouterBlockEntity blockEntity) {
return blockEntity.getRenderBoundingBox();
}

@Override
public void render(ModularRouterBlockEntity te, float partialTicks, PoseStack matrixStack, MultiBufferSource buffer, int combinedLightIn, int combinedOverlayIn) {
matrixStack.pushPose();
Expand Down

0 comments on commit f0cbfe0

Please sign in to comment.