Skip to content

Commit 726aac8

Browse files
Pieter12345Pieter12345
committed
Formatting: Replaced star imports.
Replaced star imports with the actually used imports.
1 parent 68d3326 commit 726aac8

22 files changed

Lines changed: 385 additions & 38 deletions

‎src/main/java/com/laytonsmith/PureUtilities/ClassLoading/ClassMirror/ClassMirrorVisitor.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
import org.objectweb.asm.Opcodes;
1515
import org.objectweb.asm.Type;
1616

17-
import static org.objectweb.asm.Opcodes.*;
17+
import static org.objectweb.asm.Opcodes.ACC_ENUM;
18+
import static org.objectweb.asm.Opcodes.ACC_INTERFACE;
19+
import static org.objectweb.asm.Opcodes.ASM5;
20+
import static org.objectweb.asm.Opcodes.ACC_VARARGS;
21+
import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
1822

1923
public class ClassMirrorVisitor extends ClassVisitor {
2024

‎src/main/java/com/laytonsmith/PureUtilities/Web/WebUtility.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@
44
import com.laytonsmith.PureUtilities.Common.StreamUtils;
55
import com.laytonsmith.PureUtilities.Common.StringUtils;
66

7-
import java.io.*;
7+
import java.io.BufferedOutputStream;
8+
import java.io.BufferedReader;
9+
import java.io.BufferedWriter;
10+
import java.io.FileOutputStream;
11+
import java.io.IOException;
12+
import java.io.InputStream;
13+
import java.io.InputStreamReader;
14+
import java.io.OutputStream;
15+
import java.io.UnsupportedEncodingException;
816
import java.net.HttpURLConnection;
917
import java.net.InetAddress;
1018
import java.net.InetSocketAddress;

‎src/main/java/com/laytonsmith/abstraction/bukkit/BukkitConvertor.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,18 @@
124124
import org.bukkit.inventory.Recipe;
125125
import org.bukkit.inventory.ShapedRecipe;
126126
import org.bukkit.inventory.ShapelessRecipe;
127-
import org.bukkit.inventory.meta.*;
127+
import org.bukkit.inventory.meta.BannerMeta;
128+
import org.bukkit.inventory.meta.BlockStateMeta;
129+
import org.bukkit.inventory.meta.BookMeta;
130+
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
131+
import org.bukkit.inventory.meta.FireworkEffectMeta;
132+
import org.bukkit.inventory.meta.FireworkMeta;
133+
import org.bukkit.inventory.meta.ItemMeta;
134+
import org.bukkit.inventory.meta.LeatherArmorMeta;
135+
import org.bukkit.inventory.meta.MapMeta;
136+
import org.bukkit.inventory.meta.PotionMeta;
137+
import org.bukkit.inventory.meta.SkullMeta;
138+
import org.bukkit.inventory.meta.SpawnEggMeta;
128139
import org.bukkit.metadata.FixedMetadataValue;
129140
import org.bukkit.potion.PotionData;
130141
import org.yaml.snakeyaml.Yaml;

‎src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCWorld.java‎

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,27 @@
2525
import com.laytonsmith.abstraction.entities.MCFallingBlock;
2626
import com.laytonsmith.abstraction.entities.MCFirework;
2727
import com.laytonsmith.abstraction.entities.MCHorse;
28-
import com.laytonsmith.abstraction.enums.*;
28+
import com.laytonsmith.abstraction.enums.MCBiomeType;
29+
import com.laytonsmith.abstraction.enums.MCCreeperType;
30+
import com.laytonsmith.abstraction.enums.MCDifficulty;
31+
import com.laytonsmith.abstraction.enums.MCDyeColor;
32+
import com.laytonsmith.abstraction.enums.MCEffect;
33+
import com.laytonsmith.abstraction.enums.MCEntityType;
34+
import com.laytonsmith.abstraction.enums.MCGameRule;
35+
import com.laytonsmith.abstraction.enums.MCMobs;
36+
import com.laytonsmith.abstraction.enums.MCOcelotType;
37+
import com.laytonsmith.abstraction.enums.MCParticle;
38+
import com.laytonsmith.abstraction.enums.MCPigType;
39+
import com.laytonsmith.abstraction.enums.MCProfession;
40+
import com.laytonsmith.abstraction.enums.MCSkeletonType;
41+
import com.laytonsmith.abstraction.enums.MCSound;
42+
import com.laytonsmith.abstraction.enums.MCSoundCategory;
43+
import com.laytonsmith.abstraction.enums.MCTreeType;
44+
import com.laytonsmith.abstraction.enums.MCVersion;
45+
import com.laytonsmith.abstraction.enums.MCWolfType;
46+
import com.laytonsmith.abstraction.enums.MCWorldEnvironment;
47+
import com.laytonsmith.abstraction.enums.MCWorldType;
48+
import com.laytonsmith.abstraction.enums.MCZombieType;
2949
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCBiomeType;
3050
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDifficulty;
3151
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCDyeColor;
@@ -51,7 +71,60 @@
5171
import org.bukkit.World;
5272
import org.bukkit.block.Block;
5373
import org.bukkit.block.BlockFace;
54-
import org.bukkit.entity.*;
74+
import org.bukkit.entity.Bat;
75+
import org.bukkit.entity.Blaze;
76+
import org.bukkit.entity.CaveSpider;
77+
import org.bukkit.entity.Chicken;
78+
import org.bukkit.entity.Cow;
79+
import org.bukkit.entity.Creeper;
80+
import org.bukkit.entity.Donkey;
81+
import org.bukkit.entity.ElderGuardian;
82+
import org.bukkit.entity.EnderDragon;
83+
import org.bukkit.entity.Enderman;
84+
import org.bukkit.entity.Endermite;
85+
import org.bukkit.entity.Entity;
86+
import org.bukkit.entity.EntityType;
87+
import org.bukkit.entity.Evoker;
88+
import org.bukkit.entity.Firework;
89+
import org.bukkit.entity.Ghast;
90+
import org.bukkit.entity.Giant;
91+
import org.bukkit.entity.Guardian;
92+
import org.bukkit.entity.Horse;
93+
import org.bukkit.entity.Husk;
94+
import org.bukkit.entity.Illusioner;
95+
import org.bukkit.entity.IronGolem;
96+
import org.bukkit.entity.LivingEntity;
97+
import org.bukkit.entity.Llama;
98+
import org.bukkit.entity.MagmaCube;
99+
import org.bukkit.entity.Mule;
100+
import org.bukkit.entity.MushroomCow;
101+
import org.bukkit.entity.Ocelot;
102+
import org.bukkit.entity.Parrot;
103+
import org.bukkit.entity.Pig;
104+
import org.bukkit.entity.PigZombie;
105+
import org.bukkit.entity.Player;
106+
import org.bukkit.entity.PolarBear;
107+
import org.bukkit.entity.Rabbit;
108+
import org.bukkit.entity.Sheep;
109+
import org.bukkit.entity.Shulker;
110+
import org.bukkit.entity.Silverfish;
111+
import org.bukkit.entity.Skeleton;
112+
import org.bukkit.entity.SkeletonHorse;
113+
import org.bukkit.entity.Slime;
114+
import org.bukkit.entity.Snowman;
115+
import org.bukkit.entity.Spider;
116+
import org.bukkit.entity.Squid;
117+
import org.bukkit.entity.Stray;
118+
import org.bukkit.entity.Vex;
119+
import org.bukkit.entity.Villager;
120+
import org.bukkit.entity.Vindicator;
121+
import org.bukkit.entity.Witch;
122+
import org.bukkit.entity.Wither;
123+
import org.bukkit.entity.WitherSkeleton;
124+
import org.bukkit.entity.Wolf;
125+
import org.bukkit.entity.Zombie;
126+
import org.bukkit.entity.ZombieHorse;
127+
import org.bukkit.entity.ZombieVillager;
55128
import org.bukkit.inventory.ItemStack;
56129
import org.bukkit.inventory.meta.FireworkMeta;
57130
import org.bukkit.material.MaterialData;

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitBlockEvents.java‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,41 @@
2222
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCBlockFace;
2323
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCIgniteCause;
2424
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCInstrument;
25-
import com.laytonsmith.abstraction.events.*;
25+
import com.laytonsmith.abstraction.events.MCBlockBreakEvent;
26+
import com.laytonsmith.abstraction.events.MCBlockBurnEvent;
27+
import com.laytonsmith.abstraction.events.MCBlockDispenseEvent;
28+
import com.laytonsmith.abstraction.events.MCBlockEvent;
29+
import com.laytonsmith.abstraction.events.MCBlockFadeEvent;
30+
import com.laytonsmith.abstraction.events.MCBlockFromToEvent;
31+
import com.laytonsmith.abstraction.events.MCBlockGrowEvent;
32+
import com.laytonsmith.abstraction.events.MCBlockIgniteEvent;
33+
import com.laytonsmith.abstraction.events.MCBlockPistonEvent;
34+
import com.laytonsmith.abstraction.events.MCBlockPistonExtendEvent;
35+
import com.laytonsmith.abstraction.events.MCBlockPistonRetractEvent;
36+
import com.laytonsmith.abstraction.events.MCBlockPlaceEvent;
37+
import com.laytonsmith.abstraction.events.MCNotePlayEvent;
38+
import com.laytonsmith.abstraction.events.MCSignChangeEvent;
2639
import com.laytonsmith.annotations.abstraction;
2740
import com.laytonsmith.core.constructs.CArray;
2841
import com.laytonsmith.core.constructs.CString;
2942
import com.laytonsmith.core.constructs.Target;
3043
import com.laytonsmith.core.exceptions.CRE.CREIllegalArgumentException;
3144
import org.bukkit.Note;
3245
import org.bukkit.block.Block;
33-
import org.bukkit.event.block.*;
46+
import org.bukkit.event.block.BlockBreakEvent;
47+
import org.bukkit.event.block.BlockBurnEvent;
48+
import org.bukkit.event.block.BlockDispenseEvent;
49+
import org.bukkit.event.block.BlockEvent;
50+
import org.bukkit.event.block.BlockFadeEvent;
51+
import org.bukkit.event.block.BlockFromToEvent;
52+
import org.bukkit.event.block.BlockGrowEvent;
53+
import org.bukkit.event.block.BlockIgniteEvent;
54+
import org.bukkit.event.block.BlockPistonEvent;
55+
import org.bukkit.event.block.BlockPistonExtendEvent;
56+
import org.bukkit.event.block.BlockPistonRetractEvent;
57+
import org.bukkit.event.block.BlockPlaceEvent;
58+
import org.bukkit.event.block.NotePlayEvent;
59+
import org.bukkit.event.block.SignChangeEvent;
3460
import org.bukkit.util.Vector;
3561

3662
import java.util.ArrayList;
@@ -237,8 +263,7 @@ public MCBlock getBlock() {
237263
}
238264

239265
@abstraction(type = Implementation.Type.BUKKIT)
240-
public static class BukkitMCBlockIgniteEvent extends BukkitMCBlockEvent
241-
implements MCBlockIgniteEvent {
266+
public static class BukkitMCBlockIgniteEvent extends BukkitMCBlockEvent implements MCBlockIgniteEvent {
242267

243268
BlockIgniteEvent event;
244269

@@ -403,8 +428,7 @@ public Object _GetObject() {
403428
}
404429

405430
@abstraction(type = Implementation.Type.BUKKIT)
406-
public static class BukkitMCBlockDispenseEvent extends BukkitMCBlockEvent
407-
implements MCBlockDispenseEvent {
431+
public static class BukkitMCBlockDispenseEvent extends BukkitMCBlockEvent implements MCBlockDispenseEvent {
408432

409433
BlockDispenseEvent bde;
410434

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/BukkitPlayerEvents.java‎

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,32 @@
3434
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCFishingState;
3535
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCGameMode;
3636
import com.laytonsmith.abstraction.enums.bukkit.BukkitMCTeleportCause;
37-
import com.laytonsmith.abstraction.events.*;
37+
import com.laytonsmith.abstraction.events.MCChatTabCompleteEvent;
38+
import com.laytonsmith.abstraction.events.MCExpChangeEvent;
39+
import com.laytonsmith.abstraction.events.MCFoodLevelChangeEvent;
40+
import com.laytonsmith.abstraction.events.MCGamemodeChangeEvent;
41+
import com.laytonsmith.abstraction.events.MCPlayerBedEvent;
42+
import com.laytonsmith.abstraction.events.MCPlayerChatEvent;
43+
import com.laytonsmith.abstraction.events.MCPlayerCommandEvent;
44+
import com.laytonsmith.abstraction.events.MCPlayerDeathEvent;
45+
import com.laytonsmith.abstraction.events.MCPlayerEditBookEvent;
46+
import com.laytonsmith.abstraction.events.MCPlayerEvent;
47+
import com.laytonsmith.abstraction.events.MCPlayerFishEvent;
48+
import com.laytonsmith.abstraction.events.MCPlayerInteractEvent;
49+
import com.laytonsmith.abstraction.events.MCPlayerItemConsumeEvent;
50+
import com.laytonsmith.abstraction.events.MCPlayerJoinEvent;
51+
import com.laytonsmith.abstraction.events.MCPlayerKickEvent;
52+
import com.laytonsmith.abstraction.events.MCPlayerLoginEvent;
53+
import com.laytonsmith.abstraction.events.MCPlayerMoveEvent;
54+
import com.laytonsmith.abstraction.events.MCPlayerPortalEvent;
55+
import com.laytonsmith.abstraction.events.MCPlayerPreLoginEvent;
56+
import com.laytonsmith.abstraction.events.MCPlayerQuitEvent;
57+
import com.laytonsmith.abstraction.events.MCPlayerRespawnEvent;
58+
import com.laytonsmith.abstraction.events.MCPlayerTeleportEvent;
59+
import com.laytonsmith.abstraction.events.MCPlayerToggleFlightEvent;
60+
import com.laytonsmith.abstraction.events.MCPlayerToggleSneakEvent;
61+
import com.laytonsmith.abstraction.events.MCPlayerToggleSprintEvent;
62+
import com.laytonsmith.abstraction.events.MCWorldChangedEvent;
3863
import com.laytonsmith.annotations.abstraction;
3964
import org.bukkit.Bukkit;
4065
import org.bukkit.Location;
@@ -45,8 +70,31 @@
4570
import org.bukkit.event.Event;
4671
import org.bukkit.event.entity.FoodLevelChangeEvent;
4772
import org.bukkit.event.entity.PlayerDeathEvent;
48-
import org.bukkit.event.player.*;
49-
import org.bukkit.event.player.PlayerPreLoginEvent.Result;
73+
import org.bukkit.event.player.AsyncPlayerChatEvent;
74+
import org.bukkit.event.player.PlayerBedEnterEvent;
75+
import org.bukkit.event.player.PlayerBedLeaveEvent;
76+
import org.bukkit.event.player.PlayerChangedWorldEvent;
77+
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
78+
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
79+
import org.bukkit.event.player.PlayerEditBookEvent;
80+
import org.bukkit.event.player.PlayerEvent;
81+
import org.bukkit.event.player.PlayerExpChangeEvent;
82+
import org.bukkit.event.player.PlayerFishEvent;
83+
import org.bukkit.event.player.PlayerGameModeChangeEvent;
84+
import org.bukkit.event.player.PlayerInteractEvent;
85+
import org.bukkit.event.player.PlayerItemConsumeEvent;
86+
import org.bukkit.event.player.PlayerJoinEvent;
87+
import org.bukkit.event.player.PlayerKickEvent;
88+
import org.bukkit.event.player.PlayerLoginEvent;
89+
import org.bukkit.event.player.PlayerMoveEvent;
90+
import org.bukkit.event.player.PlayerPortalEvent;
91+
import org.bukkit.event.player.PlayerPreLoginEvent;
92+
import org.bukkit.event.player.PlayerQuitEvent;
93+
import org.bukkit.event.player.PlayerRespawnEvent;
94+
import org.bukkit.event.player.PlayerTeleportEvent;
95+
import org.bukkit.event.player.PlayerToggleFlightEvent;
96+
import org.bukkit.event.player.PlayerToggleSneakEvent;
97+
import org.bukkit.event.player.PlayerToggleSprintEvent;
5098
import org.bukkit.inventory.EquipmentSlot;
5199
import org.bukkit.inventory.ItemStack;
52100

@@ -389,7 +437,7 @@ public String getResult() {
389437

390438
@Override
391439
public void setResult(String rst) {
392-
event.setResult(Result.valueOf(rst.toUpperCase()));
440+
event.setResult(PlayerPreLoginEvent.Result.valueOf(rst.toUpperCase()));
393441
}
394442

395443
@Override
@@ -400,8 +448,7 @@ public String getIP() {
400448
}
401449

402450
@abstraction(type = Implementation.Type.BUKKIT)
403-
public static class BukkitMCPlayerChatEvent extends BukkitMCPlayerEvent
404-
implements MCPlayerChatEvent {
451+
public static class BukkitMCPlayerChatEvent extends BukkitMCPlayerEvent implements MCPlayerChatEvent {
405452

406453
AsyncPlayerChatEvent pce;
407454

@@ -743,8 +790,7 @@ public static BukkitMCWorldChangedEvent _instantiate(MCPlayer entity, MCWorld fr
743790
}
744791
}
745792

746-
public static class BukkitMCPlayerFishEvent extends BukkitMCPlayerEvent
747-
implements MCPlayerFishEvent {
793+
public static class BukkitMCPlayerFishEvent extends BukkitMCPlayerEvent implements MCPlayerFishEvent {
748794

749795
PlayerFishEvent e;
750796

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitBlockListener.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,18 @@
1414
import org.bukkit.event.EventHandler;
1515
import org.bukkit.event.EventPriority;
1616
import org.bukkit.event.Listener;
17-
import org.bukkit.event.block.*;
17+
import org.bukkit.event.block.BlockBreakEvent;
18+
import org.bukkit.event.block.BlockBurnEvent;
19+
import org.bukkit.event.block.BlockDispenseEvent;
20+
import org.bukkit.event.block.BlockFadeEvent;
21+
import org.bukkit.event.block.BlockFromToEvent;
22+
import org.bukkit.event.block.BlockGrowEvent;
23+
import org.bukkit.event.block.BlockIgniteEvent;
24+
import org.bukkit.event.block.BlockPistonExtendEvent;
25+
import org.bukkit.event.block.BlockPistonRetractEvent;
26+
import org.bukkit.event.block.BlockPlaceEvent;
27+
import org.bukkit.event.block.NotePlayEvent;
28+
import org.bukkit.event.block.SignChangeEvent;
1829
import org.bukkit.inventory.ItemStack;
1930
import org.bukkit.plugin.PluginManager;
2031

‎src/main/java/com/laytonsmith/abstraction/bukkit/events/drivers/BukkitEntityListener.java‎

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

33
import com.laytonsmith.abstraction.MCEntity;
44
import com.laytonsmith.abstraction.MCPlayer;
5-
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.*;
5+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCCreatureSpawnEvent;
6+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityChangeBlockEvent;
7+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityDamageEvent;
8+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityDamageByEntityEvent;
9+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityDeathEvent;
10+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityEnterPortalEvent;
11+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityExplodeEvent;
12+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityInteractEvent;
13+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityPortalEvent;
14+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityRegainHealthEvent;
15+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCEntityToggleGlideEvent;
16+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCFireworkExplodeEvent;
17+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCHangingBreakEvent;
18+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCItemDespawnEvent;
19+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCItemSpawnEvent;
20+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerDropItemEvent;
21+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerInteractAtEntityEvent;
22+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerInteractEntityEvent;
23+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCPlayerPickupItemEvent;
24+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCProjectileHitEvent;
25+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCProjectileLaunchEvent;
26+
import com.laytonsmith.abstraction.bukkit.events.BukkitEntityEvents.BukkitMCTargetEvent;
627
import com.laytonsmith.abstraction.bukkit.events.BukkitPlayerEvents;
728
import com.laytonsmith.annotations.EventIdentifier;
829
import com.laytonsmith.core.events.Driver;

0 commit comments

Comments
 (0)