diff --git a/patches/server/0005-Hephaestus.patch b/patches/server/0005-Hephaestus.patch index 4ab098b..f9dd3ce 100644 --- a/patches/server/0005-Hephaestus.patch +++ b/patches/server/0005-Hephaestus.patch @@ -1423,6 +1423,36 @@ index e21867d3956078bb0db4ceed45e5811e9acd7377..9e1ae79ad84045933e435cc5cb08e713 } public static void dropResources(BlockState state, Level world, BlockPos pos) { +diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java +index 9a2de546dc2af2ad4bf5d32ca6583f0e1f3f70d8..d2fba745ec0ac3a7a1fa5bc157fa561c2fd53183 100644 +--- a/src/main/java/net/minecraft/world/level/block/Blocks.java ++++ b/src/main/java/net/minecraft/world/level/block/Blocks.java +@@ -1184,13 +1184,13 @@ public class Blocks { + public static final Block POTTED_AZALEA = register("potted_azalea_bush", flowerPot(AZALEA)); + public static final Block POTTED_FLOWERING_AZALEA = register("potted_flowering_azalea_bush", flowerPot(FLOWERING_AZALEA)); + public static final Block OCHRE_FROGLIGHT = register("ochre_froglight", new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.SAND).strength(0.3F).lightLevel((state) -> { +- return 15; ++ return 9; + }).sound(SoundType.FROGLIGHT))); + public static final Block VERDANT_FROGLIGHT = register("verdant_froglight", new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.GLOW_LICHEN).strength(0.3F).lightLevel((state) -> { +- return 15; ++ return 9; + }).sound(SoundType.FROGLIGHT))); + public static final Block PEARLESCENT_FROGLIGHT = register("pearlescent_froglight", new RotatedPillarBlock(BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_PINK).strength(0.3F).lightLevel((state) -> { +- return 15; ++ return 9; + }).sound(SoundType.FROGLIGHT))); + public static final Block FROGSPAWN = register("frogspawn", new FrogspawnBlock(BlockBehaviour.Properties.of().mapColor(MapColor.WATER).instabreak().noOcclusion().noCollission().sound(SoundType.FROGSPAWN).pushReaction(PushReaction.DESTROY))); + public static final Block REINFORCED_DEEPSLATE = register("reinforced_deepslate", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.DEEPSLATE).instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.DEEPSLATE).strength(55.0F, 1200.0F))); +@@ -1215,7 +1215,7 @@ public class Blocks { + } + + private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType type) { +- return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; ++ return type == EntityType.OCELOT || type == EntityType.PARROT; + } + + private static Block bed(DyeColor color) { diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java b/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java index a907b79fd8291a0e92db138f37239d17424188a1..aeaf6a32a06d375c3e5fd0f88c23d9503d78758a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java diff --git a/test-plugin/src/main/java/de/erethon/PapyrusTestPlugin.java b/test-plugin/src/main/java/de/erethon/PapyrusTestPlugin.java deleted file mode 100644 index bc47437..0000000 --- a/test-plugin/src/main/java/de/erethon/PapyrusTestPlugin.java +++ /dev/null @@ -1,57 +0,0 @@ -package de.erethon; - -import de.erethon.hephaestus.HItem; -import de.erethon.hephaestus.events.MobSpawnEntityCreateEvent; -import de.erethon.hephaestus.events.MobSpawnSettingsEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.Main; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.Mob; -import net.minecraft.world.level.biome.MobSpawnSettings; -import org.bukkit.Material; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; - -public class PapyrusTestPlugin extends JavaPlugin implements CommandExecutor, Listener { - ResourceLocation loc = new ResourceLocation("test", "test"); - HItem registered; - - @Override - public void onEnable() { - loc = new ResourceLocation("test", "test"); - if (!Main.itemLibrary.has(loc)) { - HItem hItem = new HItem.Builder(this, new ResourceLocation("test", "test")).baseItem(Material.DIAMOND_CHESTPLATE).register(); - } - registered = Main.itemLibrary.get(new ResourceLocation("test:test")); - registered.setPlugin(this); - registered.setBehaviour(new TestItemBehaviour(registered)); - Main.itemLibrary.readyBehaviours(); - getCommand("test").setExecutor(this); - Main.itemLibrary.enableHandler(this); - getServer().getPluginManager().registerEvents(this, this); - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - Player player = (Player) sender; - player.getWorld().dropItem(player.getLocation(), registered.getItem().getBukkitStack()); - return true; - } - - @EventHandler - public void onTest(MobSpawnEntityCreateEvent event) { - //event.mob = EntityType.PIG.create(event.world); - } - - @EventHandler - public void onTest2(MobSpawnSettingsEvent event) { - event.spawnerData = java.util.Optional.of(new MobSpawnSettings.SpawnerData(EntityType.PIG, 1, 20, 25)); - } -} diff --git a/test-plugin/src/main/java/de/erethon/TestItemBehaviour.java b/test-plugin/src/main/java/de/erethon/TestItemBehaviour.java deleted file mode 100644 index 958c1ec..0000000 --- a/test-plugin/src/main/java/de/erethon/TestItemBehaviour.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.erethon; - -import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; -import de.erethon.hephaestus.HItem; -import de.erethon.hephaestus.HItemBehaviour; -import net.minecraft.core.BlockPos; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.BlockState; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerInteractEvent; - - -public class TestItemBehaviour extends HItemBehaviour { - - public TestItemBehaviour(HItem item) { - super(item); - } - - @Override - public void onEquip(ItemStack stack, Player player, PlayerArmorChangeEvent event) { - Bukkit.broadcastMessage("Equipped"); - super.onEquip(stack, player, event); - } - - @Override - public void onLeftClick(ItemStack stack, Player player, PlayerInteractEvent event) { - Bukkit.broadcastMessage("left"); - super.onLeftClick(stack, player, event); - } -}