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

Commit 0d6b9c4

Browse files
rettichlprettichlp
authored
Merge pull request #660 from UnicacityAddon/develop
Release v1.10.1
2 parents b8ca292 + 4cf8885 commit 0d6b9c4

9 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎.github/ISSUE_TEMPLATE/bug-oder-fehler.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ Füge gegebenenfalls Screenshots hinzu, um das Problem zu erläutern.
2525

2626
**Weitere Informationen (bitte ausfüllen):**
2727
Minecraft Version: `1.12.2`
28-
Addon Version: `1.10.0`
28+
Addon Version: `1.10.1`

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply plugin: 'net.minecraftforge.gradle'
1414
apply plugin: 'idea'
1515
apply plugin: 'maven-publish'
1616

17-
version = '1.10.0'
17+
version = '1.10.1'
1818
group = 'com.rettichlp' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
1919
archivesBaseName = 'UnicacityAddon'
2020

‎src/main/java/com/rettichlp/unicacityaddon/UnicacityAddon.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@Mod(name = "UnicacityAddon", modid = "unicacityaddon", version = UnicacityAddon.VERSION, clientSideOnly = true, acceptedMinecraftVersions = "[1.12,1.12.2]")
3737
public class UnicacityAddon extends LabyModAddon {
3838

39-
public static final String VERSION = "1.10.0";
39+
public static final String VERSION = "1.10.1";
4040
public static final Minecraft MINECRAFT = Minecraft.getMinecraft();
4141
public static UnicacityAddon ADDON;
4242
public static final Logger LOGGER = LogManager.getLogger();

‎src/main/java/com/rettichlp/unicacityaddon/base/text/PatternHandler.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,11 @@ public class PatternHandler {
331331
*
332332
* @see com.rettichlp.unicacityaddon.events.DrugEventHandler
333333
*/
334-
public static final Pattern DRUG_VAULT_DROP_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Kokain|Methamphetamin|Marihuana|LSD) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) in der Asservatenkammer verstaut\\.$");
335-
public static final Pattern DRUG_VAULT_GET_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Kokain|Methamphetamin|Marihuana|LSD) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) aus der Asservatenkammer genommen\\.$");
336-
public static final Pattern DRUG_VAULT_INFOTITLE_PATTERN = Pattern.compile("^ ===== Asservatenkammer \\((\\w+)\\) =====$");
334+
public static final Pattern DRUG_VAULT_DROP_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Pulver|Kräuter|Kristalle|Wundertüte) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) in der Asservatenkammer verstaut\\.$");
335+
public static final Pattern DRUG_VAULT_GET_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Pulver|Kräuter|Kristalle|Wundertüte) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) aus der Asservatenkammer genommen\\.$");
336+
public static final Pattern DRUG_VAULT_INFOTITLE_PATTERN = Pattern.compile("^ ===== Asservatenkammer \\((Pulver|Kräuter|Kristalle|Wundertüte)\\) =====$");
337337
public static final Pattern DRUG_VAULT_INFO_PATTERN = Pattern.compile("^ {2}» (Mittlere|Höchste|Gute|Schlechte) Reinheit: (\\d+)g {2}» (Mittlere|Höchste|Gute|Schlechte) Reinheit: (\\d+)g {2}» (Mittlere|Höchste|Gute|Schlechte) Reinheit: (\\d+)g {2}» (Mittlere|Höchste|Gute|Schlechte) Reinheit: (\\d+)g$");
338-
public static final Pattern DRUG_VAULT_INFOLSD_PATTERN = Pattern.compile("^ {2}» LSD: (\\d+) Stück$");
339-
public static final Pattern DRUG_VAULT_BURN_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Kokain|Methamphetamin|Marihuana|LSD) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) vernichtet\\.$");
340-
public static final Pattern PLANT_BURN_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat erfolgreich eine (Kokain|Marihuana) Plantage verbrannt, over\\.$");
341-
}
338+
public static final Pattern DRUG_VAULT_INFOLSD_PATTERN = Pattern.compile("^ {2}» Wundertüte: (\\d+) Stück$");
339+
public static final Pattern DRUG_VAULT_BURN_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat (\\d+)g (Pulver|Kräuter|Kristalle|Wundertüte) \\((Höchste Reinheit|Gute Reinheit|Mittlere Reinheit|Schlechte Reinheit)\\) vernichtet\\.$");
340+
public static final Pattern PLANT_BURN_PATTERN = Pattern.compile("^HQ: (.+) (?:\\[UC])*(\\w+) hat erfolgreich eine (Pulver|Kräuter) Plantage verbrannt, over\\.$");
341+
}

‎src/main/java/com/rettichlp/unicacityaddon/commands/faction/badfaction/DropDrugAllCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public static void process() {
132132
UnicacityAddon.MINECRAFT.playerController.windowClick(windowId, 2, 0, ClickType.PICKUP, UnicacityAddon.MINECRAFT.player);
133133
} else {
134134
guiContainer.inventorySlots.getInventory().stream()
135-
.filter(itemStack -> !itemStack.isEmpty() && !itemStack.getDisplayName().contains("Kokain") && !itemStack.getDisplayName().contains("Marihuana") && !itemStack.getDisplayName().contains("Methamphetamin"))
135+
.filter(itemStack -> !itemStack.isEmpty() && !itemStack.getDisplayName().contains("Pulver") && !itemStack.getDisplayName().contains("Kräuter") && !itemStack.getDisplayName().contains("Kristalle"))
136136
.forEach(itemStack -> {
137137
NBTTagCompound nbtTagCompound = itemStack.getSubCompound("display");
138138
if (nbtTagCompound != null) {

‎src/main/java/com/rettichlp/unicacityaddon/commands/faction/badfaction/EigenbedarfCommand.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
6464
Timer t = new Timer();
6565

6666
if (ConfigElements.getCocainActivated()) {
67-
p.sendChatMessage("/dbank get Koks " + ConfigElements.getCocaineAmount() + " " + ConfigElements.getCocainDrugPurity().getPurity());
67+
p.sendChatMessage("/dbank get Pulver " + ConfigElements.getCocaineAmount() + " " + ConfigElements.getCocainDrugPurity().getPurity());
6868

6969
if (ConfigElements.getMarihuanaActivated()) {
7070
t.schedule(new TimerTask() {
7171
@Override
7272
public void run() {
73-
p.sendChatMessage("/dbank get Gras " + ConfigElements.getMarihuanaAmount() + " " + ConfigElements.getMarihuanaDrugPurity().getPurity());
73+
p.sendChatMessage("/dbank get Kräuter " + ConfigElements.getMarihuanaAmount() + " " + ConfigElements.getMarihuanaDrugPurity().getPurity());
7474

7575
if (ConfigElements.getMethActivated())
7676
t.schedule(new TimerTask() {
7777
@Override
7878
public void run() {
79-
p.sendChatMessage("/dbank get Meth " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
79+
p.sendChatMessage("/dbank get Kristalle " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
8080

8181
}
8282
}, 1000L);
@@ -87,21 +87,21 @@ public void run() {
8787
}
8888

8989
if (ConfigElements.getMarihuanaActivated()) {
90-
p.sendChatMessage("/dbank get Marihuana " + ConfigElements.getMarihuanaAmount() + " " + ConfigElements.getMarihuanaDrugPurity().getPurity());
90+
p.sendChatMessage("/dbank get Kräuter " + ConfigElements.getMarihuanaAmount() + " " + ConfigElements.getMarihuanaDrugPurity().getPurity());
9191

9292
if (ConfigElements.getMethActivated())
9393
t.schedule(new TimerTask() {
9494
@Override
9595
public void run() {
96-
p.sendChatMessage("/dbank get Meth " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
96+
p.sendChatMessage("/dbank get Kristalle " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
9797
}
9898
}, 1000L);
9999

100100
return;
101101
}
102102

103103
if (ConfigElements.getMethActivated())
104-
p.sendChatMessage("/dbank get Meth " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
104+
p.sendChatMessage("/dbank get Kristalle " + ConfigElements.getMethAmount() + " " + ConfigElements.getMethDrugPurity().getPurity());
105105
}
106106

107107
@Override

‎src/main/java/com/rettichlp/unicacityaddon/commands/faction/badfaction/GiftEigenbedarfCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
5858
}
5959

6060
if (ConfigElements.getCocainActivated()) {
61-
p.sendChatMessage("/selldrug " + args[0] + " Kokain " + ConfigElements.getCocainDrugPurity().getPurity() + " " + ConfigElements.getCocaineAmount() + " 0");
61+
p.sendChatMessage("/selldrug " + args[0] + " Pulver " + ConfigElements.getCocainDrugPurity().getPurity() + " " + ConfigElements.getCocaineAmount() + " 0");
6262

6363
if (ConfigElements.getMarihuanaActivated())
6464
checkWeed = true;
@@ -68,15 +68,15 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen
6868
}
6969

7070
if (ConfigElements.getMarihuanaActivated()) {
71-
p.sendChatMessage("/selldrug " + args[0] + " Gras " + ConfigElements.getMarihuanaDrugPurity().getPurity() + " " + ConfigElements.getMarihuanaAmount() + " 0");
71+
p.sendChatMessage("/selldrug " + args[0] + " Kräuter " + ConfigElements.getMarihuanaDrugPurity().getPurity() + " " + ConfigElements.getMarihuanaAmount() + " 0");
7272

7373
if (ConfigElements.getMethActivated())
7474
checkMeth = true;
7575
return;
7676
}
7777

7878
if (ConfigElements.getMethActivated()) {
79-
p.sendChatMessage("/selldrug " + args[0] + " Meth " + ConfigElements.getMethDrugPurity().getPurity() + " " + ConfigElements.getMethAmount() + " 0");
79+
p.sendChatMessage("/selldrug " + args[0] + " Kristalle " + ConfigElements.getMethDrugPurity().getPurity() + " " + ConfigElements.getMethAmount() + " 0");
8080
}
8181
}
8282

‎src/main/java/com/rettichlp/unicacityaddon/events/faction/badfaction/GiftEigenbedarfEventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void onClientChatReceived(ClientChatReceivedEvent e) {
3030
return;
3131

3232
if (ConfigElements.getMarihuanaActivated() && GiftEigenbedarfCommand.checkWeed) {
33-
p.sendChatMessage("/selldrug " + drugDealEndedMatcher.group(1) + " Gras " + ConfigElements.getMarihuanaDrugPurity().getPurity() + " " + ConfigElements.getMarihuanaAmount() + " 0");
33+
p.sendChatMessage("/selldrug " + drugDealEndedMatcher.group(1) + " Kräuter " + ConfigElements.getMarihuanaDrugPurity().getPurity() + " " + ConfigElements.getMarihuanaAmount() + " 0");
3434
GiftEigenbedarfCommand.checkWeed = false;
3535

3636
if (ConfigElements.getMethActivated())
@@ -39,7 +39,7 @@ public void onClientChatReceived(ClientChatReceivedEvent e) {
3939
}
4040

4141
if (ConfigElements.getMethActivated() && GiftEigenbedarfCommand.checkMeth)
42-
p.sendChatMessage("/selldrug " + drugDealEndedMatcher.group(1) + " Meth " + ConfigElements.getMethDrugPurity().getPurity() + " " + ConfigElements.getMethAmount() + " 0");
42+
p.sendChatMessage("/selldrug " + drugDealEndedMatcher.group(1) + " Kristalle " + ConfigElements.getMethDrugPurity().getPurity() + " " + ConfigElements.getMethAmount() + " 0");
4343

4444
GiftEigenbedarfCommand.checkMeth = false;
4545
}

‎src/main/resources/mcmod.info‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"modid": "unicacityaddon",
44
"name": "UnicacityAddon",
55
"description": "This addon is a modification for UnicaCity providing specialized and nice-to-have features and utilities for everyday gameplay.",
6-
"version": "1.10.0",
6+
"version": "1.10.1",
77
"mcversion": "1.12.2",
88
"url": "",
99
"updateUrl": "",

0 commit comments

Comments
 (0)