Skip to content

Commit 95dba3d

Browse files
committed
update nullable annotation
1 parent 5c0c8ef commit 95dba3d

File tree

9 files changed

+18
-10
lines changed

9 files changed

+18
-10
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ dependencies {
3939
implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.2.2")
4040

4141
implementation 'commons-io:commons-io:2.19.0'
42+
43+
//update to the new nullable... for some reason (idk why it wont work when updaing guava)
44+
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
4245
}
4346

4447
java {

src/main/java/fn10/bedrockr/addons/RMapElement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import java.util.HashMap;
66
import java.util.Map;
77

8-
import javax.annotation.Nullable;
98

109
import fn10.bedrockr.Launcher;
1110
import fn10.bedrockr.addons.source.supporting.BlockComponents;
1211
import fn10.bedrockr.addons.source.supporting.ItemComponents;
12+
import jakarta.annotation.Nullable;
1313

1414
public class RMapElement {
1515
public String ID;

src/main/java/fn10/bedrockr/addons/source/SourceBlockElement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.io.FileWriter;
66
import java.lang.reflect.Field;
77

8-
import javax.annotation.Nullable;
8+
99
import javax.swing.ImageIcon;
1010

1111
import fn10.bedrockr.addons.source.FieldFilters.RegularStringFilter;
@@ -19,6 +19,7 @@
1919
import fn10.bedrockr.windows.RElementEditingScreen;
2020
import fn10.bedrockr.windows.componets.RElementValue;
2121
import fn10.bedrockr.windows.interfaces.ElementCreationListener;
22+
import jakarta.annotation.Nullable;
2223

2324
public class SourceBlockElement implements ElementSource {
2425
private final String Location = File.separator + "elements" + File.separator;
@@ -81,7 +82,6 @@ public ElementFile getSerilized() {
8182
return this.serilized;
8283
}
8384

84-
@SuppressWarnings("null")
8585
@Override
8686
public RElementEditingScreen getBuilderWindow(Frame Parent, ElementCreationListener parent, String Workspace) {
8787
var frame = new RElementEditingScreen(Parent, "Item", this, getSerilizedClass(), parent,

src/main/java/fn10/bedrockr/addons/source/SourceItemElement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.io.FileWriter;
66
import java.lang.reflect.Field;
77

8-
import javax.annotation.Nullable;
8+
99
import javax.swing.ImageIcon;
1010
import fn10.bedrockr.addons.source.FieldFilters.RegularStringFilter;
1111
import fn10.bedrockr.addons.source.elementFiles.ItemFile;
@@ -18,6 +18,7 @@
1818
import fn10.bedrockr.windows.RElementEditingScreen;
1919
import fn10.bedrockr.windows.componets.RElementValue;
2020
import fn10.bedrockr.windows.interfaces.ElementCreationListener;
21+
import jakarta.annotation.Nullable;
2122

2223
public class SourceItemElement implements ElementSource {
2324
private final String Location = File.separator + "elements" + File.separator;
@@ -80,7 +81,6 @@ public ElementFile getSerilized() {
8081
return this.serilized;
8182
}
8283

83-
@SuppressWarnings("null")
8484
@Override
8585
public RElementEditingScreen getBuilderWindow(Frame Parent, ElementCreationListener parent, String Workspace) {
8686
var frame = new RElementEditingScreen(Parent, "Item", this, getSerilizedClass(), parent,

src/main/java/fn10/bedrockr/addons/source/SourceWPFile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.io.File;
55
import java.io.FileWriter;
66

7-
import javax.annotation.Nullable;
7+
88
import javax.swing.ImageIcon;
99

1010
import fn10.bedrockr.addons.source.elementFiles.WPFile;
@@ -14,6 +14,7 @@
1414
import fn10.bedrockr.utils.RFileOperations;
1515
import fn10.bedrockr.windows.RElementEditingScreen;
1616
import fn10.bedrockr.windows.interfaces.ElementCreationListener;
17+
import jakarta.annotation.Nullable;
1718

1819
public class SourceWPFile implements ElementSource {
1920
private final String Location = File.separator + RFileOperations.WPFFILENAME;

src/main/java/fn10/bedrockr/utils/RAnnotation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import java.lang.annotation.Retention;
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
7-
import javax.annotation.Nullable;
7+
88

99
import fn10.bedrockr.addons.source.FieldFilters.FieldFilter;
1010
import fn10.bedrockr.addons.source.interfaces.RMapElementProvider;
11+
import jakarta.annotation.Nullable;
1112

1213
public class RAnnotation {
1314

src/main/java/fn10/bedrockr/windows/RLoadingScreen.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fn10.bedrockr.windows;
22

3-
import javax.annotation.Nullable;
3+
44
import javax.swing.JLabel;
55
import javax.swing.JProgressBar;
66
import javax.swing.SpringLayout;
@@ -11,6 +11,7 @@
1111
import fn10.bedrockr.utils.ImageUtilites;
1212
import fn10.bedrockr.utils.RFonts;
1313
import fn10.bedrockr.windows.base.RDialog;
14+
import jakarta.annotation.Nullable;
1415

1516
import java.awt.*;
1617

src/main/java/fn10/bedrockr/windows/componets/RBlockly.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import java.net.URL;
44

5-
import javax.annotation.Nullable;
5+
66
import javax.swing.JTextArea;
77

88
import fn10.bedrockr.Launcher;
99
import fn10.bedrockr.utils.ErrorShower;
1010
import fn10.bedrockr.utils.RFileOperations;
11+
import jakarta.annotation.Nullable;
1112
import javafx.application.Platform;
1213
import javafx.beans.value.ChangeListener;
1314
import javafx.beans.value.ObservableValue;

src/main/java/fn10/bedrockr/windows/componets/RElement.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.awt.event.MouseListener;
88
import java.lang.reflect.InvocationTargetException;
99

10-
import javax.annotation.Nullable;
10+
1111
import javax.swing.JLabel;
1212
import javax.swing.JPanel;
1313
import javax.swing.SpringLayout;
@@ -18,6 +18,7 @@
1818
import fn10.bedrockr.addons.source.interfaces.ElementSource;
1919
import fn10.bedrockr.utils.ImageUtilites;
2020
import fn10.bedrockr.utils.RFonts;
21+
import jakarta.annotation.Nullable;
2122

2223
public class RElement extends JPanel implements MouseListener {
2324

0 commit comments

Comments
 (0)