Skip to content

Commit f219efc

Browse files
SefiraatSefiraat
authored
Update to Blob Builds
Update to Blob Builds
2 parents 88051ae + fb1bf34 commit f219efc

5 files changed

Lines changed: 72 additions & 20 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Build and Upload
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
name: Build and Upload
11+
runs-on: ubuntu-latest
12+
if: contains(github.event.head_commit.message, '[ci skip]') == false
13+
14+
steps:
15+
- uses: actions/checkout@v4.1.7
16+
17+
- name: Set up JDK 16
18+
uses: actions/setup-java@v4.2.1
19+
with:
20+
java-version: 16
21+
distribution: adopt
22+
23+
- name: Build with Maven
24+
run: mvn package
25+
26+
- name: Upload to Builds
27+
uses: WalshyDev/blob-builds/gh-action@main
28+
with:
29+
project: SlimeTinker
30+
apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
31+
releaseNotes: ${{ github.event.head_commit.message }}

‎.github/workflows/maven.yml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Java CI
1+
name: Build
22

33
on:
44
push:
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
name: Build and Upload
13+
name: Build
1414
runs-on: ubuntu-latest
1515
if: contains(github.event.head_commit.message, '[ci skip]') == false
1616

@@ -24,12 +24,4 @@ jobs:
2424
distribution: adopt
2525

2626
- name: Build with Maven
27-
run: mvn package --file pom.xml
28-
29-
- name: Upload to Builds
30-
uses: WalshyDev/blob-builds/gh-action@main
31-
with:
32-
project: SlimeTinker
33-
apiToken: ${{ secrets.BLOB_BUILDS_API_TOKEN }}
34-
file: ./target/SlimeTinker.jar
35-
releaseNotes: ${{ github.event.head_commit.message }}
27+
run: mvn package

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>dev.sefiraat</groupId>
77
<artifactId>SlimeTinker</artifactId>
8-
<version>0.1.1.2</version>
8+
<version>MODIFIED</version>
99

1010
<name>SlimeTinker</name>
1111
<description>Slimefun4 Addon SlimeTinker</description>
@@ -244,7 +244,7 @@
244244
<dependency>
245245
<groupId>com.github.Slimefun</groupId>
246246
<artifactId>Slimefun4</artifactId>
247-
<version>2c4f886</version>
247+
<version>03e5b9a</version>
248248
<scope>provided</scope>
249249
</dependency>
250250
<dependency>

‎src/main/java/io/github/sefiraat/slimetinker/SlimeTinker.java‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package io.github.sefiraat.slimetinker;
22

3-
import io.github.mooy1.infinitylib.core.AbstractAddon;
3+
import java.text.MessageFormat;
4+
5+
import javax.annotation.Nonnull;
6+
import javax.annotation.Nullable;
7+
48
import io.github.sefiraat.slimetinker.itemgroups.ItemGroups;
59
import io.github.sefiraat.slimetinker.items.Casts;
610
import io.github.sefiraat.slimetinker.items.Dies;
@@ -16,14 +20,22 @@
1620
import io.github.sefiraat.slimetinker.managers.MemoryManager;
1721
import io.github.sefiraat.slimetinker.managers.TraitManager;
1822
import io.github.sefiraat.slimetinker.runnables.RunnableManager;
23+
import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
24+
import io.github.thebusybiscuit.slimefun4.libraries.dough.updater.BlobBuildUpdater;
25+
1926
import org.bstats.bukkit.Metrics;
27+
import org.bukkit.plugin.java.JavaPlugin;
2028

21-
public class SlimeTinker extends AbstractAddon {
29+
public class SlimeTinker extends JavaPlugin implements SlimefunAddon {
2230

2331
public static final int RUNNABLE_TICK_RATE = 40;
2432

2533
private static SlimeTinker instance;
2634

35+
private final String username;
36+
private final String repo;
37+
private final String branch;
38+
2739
private RunnableManager runnableManager;
2840
private ListenerManager listenerManager;
2941
private TinkerMaterialManager tinkerMaterialManager;
@@ -33,11 +45,13 @@ public class SlimeTinker extends AbstractAddon {
3345
private MemoryManager memoryManager;
3446

3547
public SlimeTinker() {
36-
super("Sefiraat", "SlimeTinker", "master", "auto-update");
48+
this.username = "Sefiraat";
49+
this.repo = "SlimeTinker";
50+
this.branch = "master";
3751
}
3852

3953
@Override
40-
public void enable() {
54+
public void onEnable() {
4155

4256
new Metrics(this, 11748);
4357

@@ -64,10 +78,13 @@ public void enable() {
6478

6579
this.listenerManager = new ListenerManager(this, this.getServer().getPluginManager());
6680

81+
if (getConfig().getBoolean("auto-update") && getDescription().getVersion().startsWith("DEV")) {
82+
new BlobBuildUpdater(this, getFile(), "SlimeTinker", "Dev").start();
83+
}
6784
}
6885

6986
@Override
70-
protected void disable() {
87+
public void onDisable() {
7188
saveConfig();
7289
instance = null;
7390
}
@@ -101,6 +118,18 @@ public TraitManager getTraitManager() {
101118
return traitManager;
102119
}
103120

121+
@Nonnull
122+
@Override
123+
public JavaPlugin getJavaPlugin() {
124+
return this;
125+
}
126+
127+
@Nullable
128+
@Override
129+
public String getBugTrackerURL() {
130+
return MessageFormat.format("https://github.com/{0}/{1}/issues/", this.username, this.repo);
131+
}
132+
104133
public static SlimeTinker getInstance() {
105134
return instance;
106135
}

‎src/main/java/io/github/sefiraat/slimetinker/items/workstations/workbench/Workbench.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.sefiraat.slimetinker.items.workstations.workbench;
22

33
import io.github.mooy1.infinitylib.machines.CraftingBlock;
4-
import io.github.sefiraat.slimetinker.SlimeTinker;
54
import io.github.sefiraat.slimetinker.items.Workstations;
65
import io.github.sefiraat.slimetinker.utils.GUIItems;
76
import io.github.sefiraat.slimetinker.utils.ItemUtils;
7+
import io.github.sefiraat.slimetinker.utils.Keys;
88
import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
99
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
1010
import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
@@ -22,7 +22,7 @@
2222

2323
public class Workbench extends CraftingBlock {
2424

25-
public static final RecipeType TYPE = new RecipeType(SlimeTinker.createKey("tinkers-workbench"), Workstations.TINKERS_WORKBENCH);
25+
public static final RecipeType TYPE = new RecipeType(Keys.create("tinkers-workbench"), Workstations.TINKERS_WORKBENCH);
2626
protected static final int OUTPUT_SLOT = 25;
2727
protected static final int CRAFT_BUTTON = 23;
2828
private static final int[] BACKGROUND_SLOTS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 13, 14, 15, 16, 17, 18, 22, 24, 26, 27, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44};

0 commit comments

Comments
 (0)