Minecraft/PixelPics
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge of texture support

Browse Source
This commit is contained in:
Elias Müller
2025-07-12 10:09:20 +02:00
parent 0a0075ce05
commit 683cf8d80c
4 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/mhsl/minecraft/pixelpics/Main.java
View File

@ -1,13 +1,12 @@
package eu.mhsl.minecraft.pixelpic; package eu.mhsl.minecraft.pixelpics;
import eu.mhsl.minecraft.pixelpic.commands.PixelPicCommand; import eu.mhsl.minecraft.pixelpics.commands.PixelPicsCommand;
import eu.mhsl.minecraft.pixelpic.render.render.DefaultScreenRenderer; import eu.mhsl.minecraft.pixelpics.render.render.DefaultScreenRenderer;
import eu.mhsl.minecraft.pixelpic.render.render.Renderer; import eu.mhsl.minecraft.pixelpics.render.render.Renderer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.*; import java.io.*;
@ -26,7 +25,7 @@ public final class Main extends JavaPlugin {
instance = this; instance = this;
extractJsonResources(); extractJsonResources();
Bukkit.getPluginCommand("pixelPic").setExecutor(new PixelPicCommand()); Bukkit.getPluginCommand("pixelPic").setExecutor(new PixelPicsCommand());
Bukkit.getPluginCommand("test").setExecutor((sender, command, label, args) -> { Bukkit.getPluginCommand("test").setExecutor((sender, command, label, args) -> {
Material.getMaterial("acacia_button"); Material.getMaterial("acacia_button");

14
src/main/java/eu/mhsl/minecraft/pixelpics/render/raytrace/AdvancedRaytracer.java
View File

@ -1,16 +1,14 @@
package eu.mhsl.minecraft.pixelpic.render.raytrace; package eu.mhsl.minecraft.pixelpics.render.raytrace;
import eu.mhsl.minecraft.pixelpic.render.model.Model; import eu.mhsl.minecraft.pixelpics.render.model.Model;
import eu.mhsl.minecraft.pixelpic.render.registry.AdvancedModelRegistry; import eu.mhsl.minecraft.pixelpics.render.registry.AdvancedModelRegistry;
import eu.mhsl.minecraft.pixelpic.render.registry.ModelRegistry; import eu.mhsl.minecraft.pixelpics.render.util.BlockRaytracer;
import eu.mhsl.minecraft.pixelpic.render.util.BlockRaytracer; import eu.mhsl.minecraft.pixelpics.render.util.Intersection;
import eu.mhsl.minecraft.pixelpic.render.util.Intersection; import eu.mhsl.minecraft.pixelpics.render.util.MathUtil;
import eu.mhsl.minecraft.pixelpic.render.util.MathUtil;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;

14
src/main/java/eu/mhsl/minecraft/pixelpics/render/raytrace/DefaultRaytracer.java
View File

@ -1,11 +1,11 @@
package eu.mhsl.minecraft.pixelpic.render.raytrace; package eu.mhsl.minecraft.pixelpics.render.raytrace;
import eu.mhsl.minecraft.pixelpic.render.model.Model; import eu.mhsl.minecraft.pixelpics.render.model.Model;
import eu.mhsl.minecraft.pixelpic.render.registry.AdvancedModelRegistry; import eu.mhsl.minecraft.pixelpics.render.registry.AdvancedModelRegistry;
import eu.mhsl.minecraft.pixelpic.render.registry.ModelRegistry; import eu.mhsl.minecraft.pixelpics.render.registry.ModelRegistry;
import eu.mhsl.minecraft.pixelpic.render.util.BlockRaytracer; import eu.mhsl.minecraft.pixelpics.render.util.BlockRaytracer;
import eu.mhsl.minecraft.pixelpic.render.util.Intersection; import eu.mhsl.minecraft.pixelpics.render.util.Intersection;
import eu.mhsl.minecraft.pixelpic.render.util.MathUtil; import eu.mhsl.minecraft.pixelpics.render.util.MathUtil;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;

10
src/main/java/eu/mhsl/minecraft/pixelpics/render/registry/AdvancedModelRegistry.java
View File

@ -1,9 +1,9 @@
package eu.mhsl.minecraft.pixelpic.render.registry; package eu.mhsl.minecraft.pixelpics.render.registry;
import com.google.gson.Gson; import com.google.gson.Gson;
import eu.mhsl.minecraft.pixelpic.Main; import eu.mhsl.minecraft.pixelpics.Main;
import eu.mhsl.minecraft.pixelpic.render.model.AbstractModel; import eu.mhsl.minecraft.pixelpics.render.model.AbstractModel;
import eu.mhsl.minecraft.pixelpic.render.model.Model; import eu.mhsl.minecraft.pixelpics.render.model.Model;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -15,7 +15,7 @@ import java.io.*;
import java.net.URL; import java.net.URL;
import java.util.*; import java.util.*;
import static eu.mhsl.minecraft.pixelpic.render.registry.DefaultModelRegistry.TEXTURE_SIZE; import static eu.mhsl.minecraft.pixelpics.render.registry.DefaultModelRegistry.TEXTURE_SIZE;
public class AdvancedModelRegistry implements ModelRegistry { public class AdvancedModelRegistry implements ModelRegistry {
private final Gson gson = new Gson(); private final Gson gson = new Gson();