Skip to content
This repository was archived by the owner on Mar 15, 2024. It is now read-only.

Commit db2716b

Browse files
authored
Merge pull request #727 from UnicacityAddon/develop
Release v2.1.0
2 parents 953b7e9 + f0c0653 commit db2716b

154 files changed

Lines changed: 2301 additions & 849 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ assignees: ''
1111
Describe this bug with all information you have... How can it be reproduced? Do you have a crash log? What have you done
1212
before the bug occurred? What did you expect? Do you have screenshots?
1313

14-
LabyMod version:
14+
LabyMod version: `3` `4`
1515

16-
Minecraft version:
16+
Minecraft version: `1.12.2`
1717

18-
Addon version:
18+
Addon version: `2.1.0`
1919

2020
<hr>
2121

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
branches: [ "develop" ]
88
workflow_dispatch:
99

10-
env:
11-
PUBLIC_RELEASE_BUILD: true
12-
PUBLIC_RELEASE_BUILD_TOKEN: ${{ secrets.PUBLIC_RELEASE_BUILD_TOKEN }}
13-
1410
jobs:
1511
build:
1612

.github/workflows/release.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on:
55
branches: [ "main" ]
66
workflow_dispatch:
77

8-
env:
9-
PUBLIC_RELEASE_BUILD: true
10-
PUBLIC_RELEASE_BUILD_TOKEN: ${{ secrets.PUBLIC_RELEASE_BUILD_TOKEN }}
11-
128
jobs:
139
labyaddon:
1410

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ Supported Minecraft versions:
6161

6262
- `1.12.2`
6363
- `1.16.5`
64-
- ~~`1.17.1`~~ (Unicacity does not currently support this version)
65-
- ~~`1.18.2`~~ (Unicacity does not currently support this version)
66-
- ~~`1.19.2`~~ (Unicacity does not currently support this version)
67-
- ~~`1.19.3`~~ (Unicacity does not currently support this version)
68-
- ~~`1.19.4`~~ (Unicacity does not currently support this version)
64+
- `1.17.1`
65+
- `1.18.2`
66+
- `1.19.2`
67+
- `1.19.3`
68+
- `1.19.4`
6969

7070
## Installation
7171

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.rettichlp.unicacityaddon.api;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
6+
import java.util.List;
7+
8+
/**
9+
* @author RettichLP
10+
*/
11+
@Getter
12+
@AllArgsConstructor
13+
public class AutoNC {
14+
15+
private final long id;
16+
private final List<String> words;
17+
private final String answer;
18+
}

api/src/main/java/com/rettichlp/unicacityaddon/api/NaviPoint.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public class NaviPoint {
1717
private final int z;
1818
private final String article;
1919

20-
public String getTabName() {
21-
return name.replace(" ", "-");
20+
public String getDisplayName() {
21+
return name.replace("-", " ");
2222
}
2323

2424
public String getArticleFourthCase() {
@@ -28,4 +28,8 @@ public String getArticleFourthCase() {
2828
public FloatVector3 getLocation() {
2929
return new FloatVector3(x, y, z);
3030
}
31+
32+
public String getNaviCommand() {
33+
return "/navi " + x + "/" + y + "/" + z;
34+
}
3135
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.rettichlp.unicacityaddon.api;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
6+
/**
7+
* @author RettichLP
8+
*/
9+
@Getter
10+
@AllArgsConstructor
11+
public class RoleplayName {
12+
13+
private final String roleplayName;
14+
private final String minecraftUuid;
15+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.rettichlp.unicacityaddon.api.event;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
6+
/**
7+
* @author RettichLP
8+
*/
9+
@Getter
10+
@AllArgsConstructor
11+
public class Event {
12+
13+
private final long bomb;
14+
private final EventGangwar gangwar;
15+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.rettichlp.unicacityaddon.api.event;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
6+
/**
7+
* @author RettichLP
8+
*/
9+
@Getter
10+
@AllArgsConstructor
11+
public class EventGangwar {
12+
13+
private final int attacker;
14+
private final int defender;
15+
}

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "com.rettichlp.unicacityaddon"
8-
version = "2.0.0"
8+
version = "2.1.0"
99

1010
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
1111

@@ -17,7 +17,7 @@ labyMod {
1717
author = "RettichLP & Dimiikou"
1818
description = "UnicacityAddon is a LabyMod addon written for the Minecraft server Unicacity and provides specialized, nice-to-have features and utilities for everyday gameplay."
1919
minecraftVersion = "1.12.2<*"
20-
version = System.getenv().getOrDefault("VERSION", "2.0.0")
20+
version = System.getenv().getOrDefault("VERSION", "2.1.0")
2121
}
2222

2323
minecraft {
@@ -43,7 +43,7 @@ labyMod {
4343
}
4444

4545
addonDev {
46-
snapshotRelease()
46+
productionRelease()
4747
}
4848
}
4949

0 commit comments

Comments
 (0)