Merge pull request 'Testing' (#33) from Testing into Release

Reviewed-on: Steev/betterminecraft#33

.gitea/workflows/release.yml

@@ -1,60 +0,0 @@
-name: Build and Release Minecraft Plugin
-
-on:
-  push:
-    branches:
-      - Resting
-
-jobs:
-  build-and-release:
-
-    steps:
-      # Repository auschecken
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      # Java 17 installieren
-      - name: Set up Java 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      # Maven installieren
-      - name: Install Maven
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y maven
-
-      # Plugin-Version aus plugin.yml auslesen
-      - name: Extract Plugin Version
-        id: extract_version
-        run: |
-          VERSION=$(grep '^version:' src/main/resources/plugin.yml | awk '{print $2}')
-          echo "PLUGIN_VERSION=$VERSION" >> $GITHUB_ENV
-
-      # Projekt mit Maven bauen
-      - name: Build with Maven
-        run: mvn clean package
-
-      # JAR-Datei umbenennen
-      - name: Rename JAR File
-        run: |
-          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Artefakt hochladen
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Release erstellen
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          tag_name: ${{ env.PLUGIN_VERSION }}
-          release_name: Release ${{ env.PLUGIN_VERSION }}
-          draft: false
-          prerelease: false

.gitea/workflows/release.yml.disabled

@@ -0,0 +1,65 @@
+name: Build and Release Minecraft Plugin
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+
+    - name: Update Apt
+      run: apt update -y
+
+    - name: Update CA certificates
+      run: apt-get install --reinstall ca-certificates -y
+
+    - name: Install Maven
+      run: apt install maven -y
+
+    - name: Build with Maven
+      run: mvn clean install
+      
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: BetterMinecraft-stable.jar
+        path: target/BetterMinecraft-stable.jar
+        steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Get letzte Release-Version
+      id: get_version
+      run: echo "::set-output name=version::$(git describe --tags --abbrev=0 || echo '0.0.0')"
+
+    - name: Incrementiere Version
+      id: increment_version
+      run: |
+        IFS='.' read -ra VERSION <<< "${{ steps.get_version.outputs.version }}"
+        MAJOR="${VERSION[0]}"
+        MINOR="${VERSION[1]}"
+        PATCH="${VERSION[2]}"
+        echo "::set-output name=major::$(($MAJOR + 1))"
+        echo "::set-output name=minor::$(($MINOR + 1))"
+        echo "::set-output name=patch::$(($PATCH + 1))"
+
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          target/BetterMinecraft-stable.jar
+        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        draft: false
+        prerelease: false

.gitea/workflows/release.yml.off

@@ -0,0 +1,65 @@
+name: Build and Release Minecraft Plugin
+
+on:
+  push:
+    branches:
+      - Release
+
+jobs:
+  build:
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        java-version: '17'
+        distribution: 'adopt' # Verwenden Sie 'adopt' für Java 17
+
+    - name: Update Apt
+      run: apt update -y
+
+    - name: Update CA certificates
+      run: apt-get install --reinstall ca-certificates -y
+
+    - name: Install Maven
+      run: apt install maven -y
+
+    - name: Build with Maven
+      run: mvn clean install
+      
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: BetterMinecraft-stable.jar
+        path: target/BetterMinecraft-stable.jar
+        steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+
+    - name: Get letzte Release-Version
+      id: get_version
+      run: echo "::set-output name=version::$(git describe --tags --abbrev=0 || echo '0.0.0')"
+
+    - name: Incrementiere Version
+      id: increment_version
+      run: |
+        IFS='.' read -ra VERSION <<< "${{ steps.get_version.outputs.version }}"
+        MAJOR="${VERSION[0]}"
+        MINOR="${VERSION[1]}"
+        PATCH="${VERSION[2]}"
+        echo "::set-output name=major::$(($MAJOR + 1))"
+        echo "::set-output name=minor::$(($MINOR + 1))"
+        echo "::set-output name=patch::$(($PATCH + 1))"
+
+    - name: Create Release
+      id: create_release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: |
+          target/BetterMinecraft-stable.jar
+        tag_name: ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        release_name: Release ${{ steps.increment_version.outputs.major }}.${{ steps.increment_version.outputs.minor }}.${{ steps.increment_version.outputs.patch }}
+        draft: false
+        prerelease: false

.gitea/workflows/test.md

@@ -1 +0,0 @@
-testtesttesttrest

.gitea/workflows/test.yml

@@ -1,60 +0,0 @@
-name: Build and Release Minecraft Plugin
-
-on:
-  push:
-    branches:
-      - Testing
-
-jobs:
-  build-and-release:
-    
-    steps:
-      # Repository auschecken
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-
-      # Java 17 installieren
-      - name: Set up Java 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      # Maven installieren
-      - name: Install Maven
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y maven
-
-      # Plugin-Version aus plugin.yml auslesen
-      - name: Extract Plugin Version
-        id: extract_version
-        run: |
-          VERSION=$(grep '^version:' src/main/resources/plugin.yml | awk '{print $2}')
-          echo "PLUGIN_VERSION=$VERSION" >> $GITHUB_ENV
-
-      # Projekt mit Maven bauen
-      - name: Build with Maven
-        run: mvn clean package
-
-      # JAR-Datei umbenennen
-      - name: Rename JAR File
-        run: |
-          mv target/*.jar target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Artefakt hochladen
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          path: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-
-      # Release erstellen
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: target/BetterMinecraft-${{ env.PLUGIN_VERSION }}-b.jar
-          tag_name: ${{ env.PLUGIN_VERSION }}
-          release_name: Release ${{ env.PLUGIN_VERSION }}
-          draft: false
-          prerelease: true

changelog.txt

@@ -1,2 +0,0 @@
-+ added system type changelog
-+ added custom type changelog

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>de.steev.bm</groupId>
   <artifactId>BetterMinecraft</artifactId>
-  <version>1.2.2</version>
+  <version>stable</version>
 
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.21.1-R0.1-SNAPSHOT</version>
+      <version>1.20.1-R0.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

src/main/java/de/steev/bm/BetterMinecraft.java

@@ -4,85 +4,91 @@ import de.steev.bm.Commands.back;
 import de.steev.bm.Listener.BedListener;
 import de.steev.bm.Listener.InteractListener;
 import de.steev.bm.Listener.KillListener;
-import de.steev.bm.Listener.PrepareAnvilListener;
 import de.steev.bm.Manager.GameManager;
-import de.steev.bm.utils.Config;
+
-import de.steev.bm.utils.exceptions.ConfigEntryExceptions;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.File;
 import java.io.IOException;
-import java.util.Objects;
 import java.util.UUID;
-import static de.steev.bm.utils.Constants.*;
 
 public class BetterMinecraft extends JavaPlugin implements Listener {
 
 	// Global Variables that might come helpfull later
 	public int playerInBed = 0;
 	public World world;
+	String version = "1.2";
 
 	// Custom Playerdata File
-	private Config playerData = new Config(playerDataFilename, this);
+	private File playerdata;
+	private FileConfiguration playerDataConfig;
+	private final String playerdatafilename = "playerdata.yml";
+	private static String prefix = ChatColor.GRAY + "[" + ChatColor.AQUA + "BetterMinecraft" + ChatColor.GRAY + "]";
+
 	private GameManager gameManager;
 
 	// Handles initialisation
 	public void onEnable() {
 		// Messaging
-		this.getLogger().info(prefix + ChatColor.WHITE + "Plugin Startup");
+		this.getLogger().info(prefix + ChatColor.WHITE + "Plugin Startet");
 		this.getLogger().info(prefix + ChatColor.WHITE + "Initializing Gamemanager");
 		gameManager = new GameManager(this);
 		this.saveDefaultConfig();
 
 		// Registers Events
-		this.getLogger().info(prefix + ChatColor.WHITE + "Load Events");
+		this.getLogger().info(prefix + ChatColor.WHITE + "Lade Events");
 		this.getServer().getPluginManager().registerEvents(new BedListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(new KillListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(new InteractListener(this.gameManager), this);
-		this.getServer().getPluginManager().registerEvents(new PrepareAnvilListener(this.gameManager), this);
 		this.getServer().getPluginManager().registerEvents(this, this);
 
-		Objects.requireNonNull(this.getCommand("back")).setExecutor(new back(this.gameManager));
+		this.getCommand("back").setExecutor(new back(this.gameManager));
 
 		// PlayerData
-        try {
+		playerdata = new File(this.getDataFolder(), playerdatafilename);
-            this.playerData.saveConfig(playerDataFilename);
+		playerDataConfig = YamlConfiguration.loadConfiguration(playerdata);
-        } catch (IOException e) {
+		saveplayerdata();
-            throw new RuntimeException(e);
-        }
 
-        // More Messaging
+		// More Messaging
-		this.getLogger().info(ChatColor.AQUA + "Startup complete :D");
+		this.getLogger().info(ChatColor.AQUA + "Ich bin Fertig :D");
 	}
 
 	@EventHandler
 	void onPlayerJoin(PlayerJoinEvent e) {
 		Player p = (Player) e.getPlayer();
 		UUID uuid = p.getUniqueId();
+		// prevent this allways resetting the job count
+		if (this.playerDataConfig.get(uuid + "." + version + ".read") == null) {
+			p.sendMessage("================= Better Minecraft " + version + " =================");
+			p.sendMessage("Command: /back eingefügt");
+			p.sendMessage("=====================================================");
 
-		try {
+			this.playerDataConfig.set(uuid + ".name", p.getName());
-			if (this.playerData.readBooleanFromConfig(uuid + "." + Version + ".read")) {
+			this.playerDataConfig.set(uuid + "." + version + ".read", "true");
-				p.sendMessage("================= Better Minecraft " + Version + " =================");
+			saveplayerdata();
-				p.sendMessage("Amboss Kostengrenze entfernt");
-				p.sendMessage("=====================================================");
-
-				this.playerData.writeStringToConfig(uuid + ".name", p.getName());
-				this.playerData.writeStringToConfig(uuid + "." + Version + ".read", "true");
-				this.playerData.saveConfig(playerDataFilename);
-			}
-		} catch (ConfigEntryExceptions cee) {
-			this.getLogger().warning("reading config failed with error: " + cee.getMessage());
-		} catch (IOException ioe) {
-			throw new RuntimeException(ioe);
 		}
 	}
 
+	void saveplayerdata() {
+		try {
+			playerDataConfig.save(playerdata);
+		} catch (IOException e) {
+			this.getLogger().warning("Unable to save " + playerdatafilename); // shouldn't really happen, but save
+			// throws the exception
+		}
+	}
+
+	public FileConfiguration getPlayerDataConfig(){
+		return this.playerDataConfig;
+	}
 	public static String LoggerPrefix(){
 		return prefix;
 	}
@@ -91,8 +97,4 @@ public class BetterMinecraft extends JavaPlugin implements Listener {
 		// Even more Messaging
 		this.getLogger().info(ChatColor.AQUA + "Ich geh dann mal :c");
 	}
-
-	public FileConfiguration getPlayerDataConfig() {
-		return this.playerData.getConfig();
-	}
 }

src/main/java/de/steev/bm/Interaction/AnvilCalculator.java

@@ -1,29 +0,0 @@
-package de.steev.bm.Interaction;
-
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.Repairable;
-
-public class AnvilCalculator {
-    public static int getRepairCost(ItemStack item) {
-        if (item == null || item.getType().isAir()) return 0;
-        ItemMeta meta = item.getItemMeta();
-        if (meta instanceof Repairable) {
-            Repairable r = (Repairable) meta;
-            return r.getRepairCost(); // default 0 wenn nicht gesetzt
-        }
-        return 0;
-    }
-
-    public static ItemStack setRepairCost(ItemStack item, int cost) {
-        if (item == null || item.getType().isAir()) return item;
-        ItemMeta meta = item.getItemMeta();
-        if (meta instanceof Repairable) {
-            Repairable r = (Repairable) meta;
-            r.setRepairCost(cost);
-            item.setItemMeta(meta);
-        }
-        return item;
-    }
-}

src/main/java/de/steev/bm/Listener/KillListener.java

@@ -32,7 +32,7 @@ public class KillListener implements Listener {
         if(event.getEntity() instanceof Player && this.gameManager.getConfigManager().GetBool("back_command")){
             Location death = ((Player) event.getEntity()).getPlayer().getLocation();
             UUID uuid = ((Player) event.getEntity()).getPlayer().getUniqueId();
-            this.gameManager.getPlugin().getPlayerDataConfig().set(uuid + ".death", death);
+            this.gameManager.getPlugin().getPlayerDataConfig().set("" + uuid + ".death", death);
         } else if(event.getEntity() instanceof Animals) {
             if(event.getEntity().toString() == "CraftPig" && this.gameManager.getConfigManager().GetBool("custom_drops")){
                 amounts = new int[]{ 2,2 };

src/main/java/de/steev/bm/Listener/PrepareAnvilListener.java

@@ -1,21 +0,0 @@
-package de.steev.bm.Listener;
-
-import de.steev.bm.BetterMinecraft;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.inventory.PrepareAnvilEvent;
-import org.bukkit.inventory.AnvilInventory;
-
-public class PrepareAnvilListener {
-
-    private BetterMinecraft plugin;
-
-    public PrepareAnvilListener(BetterMinecraft plugin) {
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void onPrepare(PrepareAnvilEvent event) {
-        AnvilInventory inv = event.getInventory();
-        inv.setMaximumRepairCost(Integer.MAX_VALUE);
-    }
-}

src/main/java/de/steev/bm/utils/Changelog.java

@@ -1,60 +0,0 @@
-package de.steev.bm.utils;
-
-import de.steev.bm.Manager.GameManager;
-import org.bukkit.entity.Player;
-
-enum ChangelogType {
-        SystemChangeLog,
-        CustomChangelog
-}
-
-public class Changelog {
-    private GameManager plugin;
-
-    public Changelog(GameManager plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * handles getting changelog and sending it to the player
-     * @param player the receiving player
-     */
-    public void SendChangelog(Player player) {
-        //player.sendMessage(createChangelog());
-    }
-
-    /**
-     * handles checking the playerdata if a player already saw the changelog
-     * @param player the player to lookup
-     * @return boolean which tells whether a player has seen the changelog or not
-     */
-    private boolean hasPlayerSeenChangelog(ChangelogType changelogType, Player player) {
-        // TODO: read from header what version the changelog is for
-        // TODO: read from playerdata.yml if the player has seen the changelog for that type
-        // TODO: return found result
-        return false;
-    }
-
-    /***
-     * reads the set changlog file
-     * @return the resulting changelog as string
-     */
-    private String createChangelog(ChangelogType changelogType) {
-        // TODO: FETCH from
-
-        /*switch (changelogType) {
-            case SystemChangeLog:
-                // TODO: get changelog url from config
-                // TODO: fetch version changelog from git
-                // TODO: proccess changelog
-                break;
-            case CustomChangelog:
-                // TODO: fetch changes from changes.txt found in plugin folder or from configured destination
-                // TODO: proccess changelog
-                break;
-
-        }*/
-
-        return "";
-    }
-}

src/main/java/de/steev/bm/utils/Config.java

@@ -1,72 +0,0 @@
-package de.steev.bm.utils;
-
-import de.steev.bm.BetterMinecraft;
-import de.steev.bm.utils.exceptions.ConfigEntryExceptions;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.io.IOException;
-
-import static de.steev.bm.utils.Constants.playerDataFilename;
-
-public class Config {
-    private String name;
-    private File configFile;
-    private FileConfiguration fileConfiguration;
-    private BetterMinecraft plugin;
-
-    public Config(String name, BetterMinecraft plugin) {
-        this.name = name;
-        this.plugin = plugin;
-        configFile = new File(this.plugin.getDataFolder(), playerDataFilename);
-        fileConfiguration = YamlConfiguration.loadConfiguration(configFile);
-    }
-
-    public void saveConfig(String name) throws IOException {
-        try {
-            fileConfiguration.save(configFile);
-        } catch (IOException e) {
-            this.plugin.getLogger().warning("Unable to save " + playerDataFilename); // shouldn't really happen, but save
-            // throws the exception
-            throw e;
-        }
-    }
-
-    public void writeStringToConfig(String path, String value) {
-        this.fileConfiguration.set(path, value);
-    }
-
-    public String readStringFromConfig(String path) throws ConfigEntryExceptions {
-
-        if (this.fileConfiguration.get(path) == null) {
-            throw new ConfigEntryExceptions("entry at: " + path + " found null");
-        }
-
-        return this.fileConfiguration.getString(path);
-    }
-
-    public int readIntFromConfig(String path) throws ConfigEntryExceptions {
-        if (this.fileConfiguration.get(path) == null) {
-            throw new ConfigEntryExceptions("entry at: " + path + " found null");
-        }
-
-        return this.fileConfiguration.getInt(path);
-    }
-
-    public boolean readBooleanFromConfig(String path) throws ConfigEntryExceptions {
-        if (this.fileConfiguration.get(path) == null) {
-            throw new ConfigEntryExceptions("entry at: " + path + " found null");
-        }
-
-        return this.fileConfiguration.getBoolean(path);
-    }
-
-    public FileConfiguration getConfig() {
-        return this.fileConfiguration;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-}

src/main/java/de/steev/bm/utils/Constants.java

@@ -1,9 +0,0 @@
-package de.steev.bm.utils;
-
-import org.bukkit.ChatColor;
-
-public class Constants {
-    public static final String prefix = ChatColor.GRAY + "[" + ChatColor.AQUA + "BetterMinecraft" + ChatColor.GRAY + "]";
-    public static final String playerDataFilename = "playerdata.yml";
-    public static final String Version = "1.2.2";
-}

src/main/java/de/steev/bm/utils/exceptions/ConfigEntryExceptions.java

@@ -1,9 +0,0 @@
-package de.steev.bm.utils.exceptions;
-
-public class ConfigEntryExceptions extends Exception {
-    public ConfigEntryExceptions() {}
-
-    public ConfigEntryExceptions(String message) {
-        super(message);
-    }
-}

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: BetterMinecraft
 main: de.steev.bm.BetterMinecraft
-version: 1.2.2
+version: 1.0
-api-version: 1.21
+api-version: 1.17
 commands:
   back:
     description: "teleports players back to their deathpoint"