Skip to content
This repository was archived by the owner on Jun 3, 2023. It is now read-only.

Commit 4714341

Browse files
Updated to MC 1.18
1 parent 4083a66 commit 4714341

File tree

22 files changed

+99
-170
lines changed

22 files changed

+99
-170
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build Artifacts
2+
3+
on:
4+
push:
5+
release:
6+
types: [ created ]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Code
13+
uses: actions/checkout@v2
14+
15+
- name: Set Up JDK 17
16+
uses: actions/setup-java@v2
17+
with:
18+
java-version: '17'
19+
distribution: 'adopt'
20+
21+
- name: Build With Maven
22+
run: mvn -B clean test package "-Ddir=artifacts/" --file pom.xml
23+
24+
- name: Upload Artifacts
25+
id: upload
26+
uses: actions/upload-artifact@v2
27+
with:
28+
name: Artifacts
29+
path: ./artifacts/*.jar
30+
31+
- name: Publish Artifacts
32+
if: github.event_name == 'release'
33+
34+
env:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
with:
37+
args: './artifacts/*.jar'

pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<groupId>de.studiocode</groupId>
88
<artifactId>MiniatureBlocks</artifactId>
9-
<version>0.14.1</version>
9+
<version>0.15</version>
1010

1111
<properties>
12-
<kotlin.version>1.5.20</kotlin.version>
12+
<kotlin.version>1.6.10</kotlin.version>
1313
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<shadePath>de.studiocode.miniatureblocks.lib</shadePath>
@@ -31,8 +31,8 @@
3131
<url>https://repo.codemc.org/repository/maven-public</url>
3232
</repository>
3333
<repository>
34-
<id>jitpack.io</id>
35-
<url>https://jitpack.io</url>
34+
<id>xenondevs</id>
35+
<url>https://repo.xenondevs.xyz/releases/</url>
3636
</repository>
3737
</repositories>
3838

@@ -58,18 +58,18 @@
5858
<dependency>
5959
<groupId>org.spigotmc</groupId>
6060
<artifactId>spigot-api</artifactId>
61-
<version>1.17-R0.1-SNAPSHOT</version>
61+
<version>1.18.1-R0.1-SNAPSHOT</version>
6262
<scope>provided</scope>
6363
</dependency>
6464
<dependency>
6565
<groupId>net.lingala.zip4j</groupId>
6666
<artifactId>zip4j</artifactId>
67-
<version>2.7.0</version>
67+
<version>2.9.1</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>commons-io</groupId>
7171
<artifactId>commons-io</artifactId>
72-
<version>2.7</version>
72+
<version>2.11.0</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.mojang</groupId>
@@ -80,17 +80,17 @@
8080
<dependency>
8181
<groupId>org.bstats</groupId>
8282
<artifactId>bstats-bukkit</artifactId>
83-
<version>1.7</version>
83+
<version>2.2.1</version>
8484
</dependency>
8585
<dependency>
86-
<groupId>com.github.NichtStudioCode.InvUI</groupId>
86+
<groupId>de.studiocode.invui</groupId>
8787
<artifactId>InvUI</artifactId>
88-
<version>e92abcf079</version>
88+
<version>0.1-SNAPSHOT</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>xyz.xenondevs</groupId>
9292
<artifactId>particle</artifactId>
93-
<version>1.6.1</version>
93+
<version>1.7</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>me.xdrop</groupId>
@@ -143,7 +143,7 @@
143143
<artifactId>maven-shade-plugin</artifactId>
144144
<version>3.3.0-SNAPSHOT</version>
145145
<configuration>
146-
<outputFile>${dir}/${project.artifactId}-${project.version}-shaded.jar</outputFile>
146+
<outputFile>${dir}/${project.artifactId}-${project.version}.jar</outputFile>
147147
<createDependencyReducedPom>false</createDependencyReducedPom>
148148
</configuration>
149149
<executions>

src/main/kotlin/de/studiocode/miniatureblocks/MiniatureBlocks.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import de.studiocode.miniatureblocks.region.RegionManager
99
import de.studiocode.miniatureblocks.resourcepack.ResourcePack
1010
import de.studiocode.miniatureblocks.resourcepack.texture.BlockTexture
1111
import org.bstats.bukkit.Metrics
12-
import org.bstats.bukkit.Metrics.SingleLineChart
12+
import org.bstats.charts.SingleLineChart
1313
import org.bukkit.plugin.java.JavaPlugin
1414
import java.io.File
1515

src/main/kotlin/de/studiocode/miniatureblocks/menu/AnimationMenu.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import de.studiocode.invui.gui.SlotElement
44
import de.studiocode.invui.gui.SlotElement.ItemSlotElement
55
import de.studiocode.invui.gui.impl.PagedGUI
66
import de.studiocode.invui.gui.structure.Structure
7-
import de.studiocode.invui.item.ItemBuilder
7+
import de.studiocode.invui.item.builder.ItemBuilder
88
import de.studiocode.invui.item.impl.BaseItem
99
import de.studiocode.invui.item.impl.SimpleItem
1010
import de.studiocode.invui.resourcepack.Icon

src/main/kotlin/de/studiocode/miniatureblocks/menu/Menus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package de.studiocode.miniatureblocks.menu
33
import de.studiocode.invui.gui.impl.PagedGUI
44
import de.studiocode.invui.gui.structure.Markers
55
import de.studiocode.invui.gui.structure.Structure
6-
import de.studiocode.invui.item.ItemBuilder
6+
import de.studiocode.invui.item.builder.ItemBuilder
77
import de.studiocode.invui.item.impl.controlitem.PageItem
88
import de.studiocode.invui.resourcepack.Icon
99

src/main/kotlin/de/studiocode/miniatureblocks/menu/SearchMenu.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import de.studiocode.invui.gui.builder.guitype.GUIType
66
import de.studiocode.invui.gui.impl.SimpleGUI
77
import de.studiocode.invui.gui.impl.SimplePagedItemsGUI
88
import de.studiocode.invui.item.Item
9-
import de.studiocode.invui.item.ItemBuilder
9+
import de.studiocode.invui.item.builder.ItemBuilder
1010
import de.studiocode.invui.item.impl.BaseItem
1111
import de.studiocode.invui.item.impl.SimpleItem
1212
import de.studiocode.invui.resourcepack.Icon

src/main/kotlin/de/studiocode/miniatureblocks/menu/TexturesMenu.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import de.studiocode.invui.gui.builder.GUIBuilder
44
import de.studiocode.invui.gui.builder.guitype.GUIType
55
import de.studiocode.invui.gui.impl.SimplePagedItemsGUI
66
import de.studiocode.invui.item.Item
7-
import de.studiocode.invui.item.ItemBuilder
7+
import de.studiocode.invui.item.builder.ItemBuilder
88
import de.studiocode.invui.item.impl.BaseItem
99
import de.studiocode.invui.item.impl.SimpleItem
1010
import de.studiocode.invui.item.impl.SuppliedItem

src/main/kotlin/de/studiocode/miniatureblocks/miniature/armorstand/MiniatureArmorStand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ abstract class MiniatureArmorStand(val armorStand: ArmorStand) : Miniature(armor
3838
val nmsArmorStand = ReflectionUtils.createNMSEntity(world, location, EntityType.ARMOR_STAND)
3939

4040
// set head item silently
41-
ReflectionUtils.setArmorStandArmorItems(nmsArmorStand, 3, ReflectionUtils.createNMSItemStackCopy(itemStack))
41+
ReflectionUtils.setArmorStandHeadStack(nmsArmorStand, ReflectionUtils.createNMSItemStackCopy(itemStack))
4242

4343
// get CraftArmorStand
4444
val armorStand = ReflectionUtils.createBukkitEntityFromNMSEntity(nmsArmorStand) as ArmorStand

src/main/kotlin/de/studiocode/miniatureblocks/miniature/armorstand/impl/AnimatedMiniatureArmorStand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class AnimatedMiniatureArmorStand(armorStand: ArmorStand) : MiniatureArmorStand(
6262
if (ticksPassed == tickDelay) {
6363
ticksPassed = 0
6464
if (nmsItemStacks.size == currentIndex) currentIndex = 0
65-
ReflectionUtils.setArmorStandArmorItems(nmsArmorStand, 3, nmsItemStacks[currentIndex])
65+
ReflectionUtils.setArmorStandHeadStack(nmsArmorStand, nmsItemStacks[currentIndex])
6666
currentIndex++
6767
}
6868
}

src/main/kotlin/de/studiocode/miniatureblocks/miniature/item/MiniatureItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package de.studiocode.miniatureblocks.miniature.item
22

3-
import de.studiocode.invui.item.ItemBuilder
3+
import de.studiocode.invui.item.builder.ItemBuilder
44
import de.studiocode.miniatureblocks.MiniatureBlocks
55
import de.studiocode.miniatureblocks.miniature.Miniature
66
import de.studiocode.miniatureblocks.miniature.armorstand.MiniatureManager.MiniatureType

0 commit comments

Comments
 (0)