Skip to content

Instantly share code, notes, and snippets.

@raa0121
Created July 30, 2014 08:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save raa0121/9f49cc052d47f05040f1 to your computer and use it in GitHub Desktop.
Save raa0121/9f49cc052d47f05040f1 to your computer and use it in GitHub Desktop.
diff --git a/client/src/cloft2/app.clj b/client/src/cloft2/app.clj
index b072892..ff08631 100644
--- a/client/src/cloft2/app.clj
+++ b/client/src/cloft2/app.clj
@@ -14,7 +14,7 @@
[org.bukkit.entity Arrow Player Horse]
[org.bukkit.inventory ItemStack]
[org.bukkit.util Vector]))
-
+(-> env .getClass)
(doseq [[name _] (ns-publics *ns*)] (ns-unmap *ns* name))
(defn PlayerToggleSprintEvent [^org.bukkit.event.player.PlayerToggleSprintEvent evt]
@@ -28,18 +28,18 @@
(cloft2.sneaking-jump/PlayerMoveEvent evt player)))
(defn EntityDamageEvent [^org.bukkit.event.entity.EntityDamageEvent evt]
- (when (= org.bukkit.event.entity.EntityDamageEvent (.getClass evt))
+ (when (= org.bukkit.event.entity.EntityDamageEvent (-> evt .getClass))
(cloft2.sneaking-jump/EntityDamageEvent evt (-> evt .getEntity))
(cloft2.safe-grass/EntityDamageEvent evt (-> evt .getEntity))))
(defn EntityDeathEvent [^org.bukkit.event.entity.EntityDeathEvent evt]
- (if (= org.bukkit.event.entity.PlayerDeathEvent (.getClass evt))
+ (if (= org.bukkit.event.entity.PlayerDeathEvent (-> evt .getClass))
(let [player (-> evt .getEntity)]
(l/post-lingr (-> evt .getDeathMessage)))
(let [entity (-> evt .getEntity)]
(when-let [killer-player (-> entity .getKiller)]
(let [name (->> entity class str (re-find #"Craft([^)]*)") last)
- msg (<< "~{ChatColor/AQUA}~(.getName killer-player)~{ChatColor/RESET} killed a ~{name}")]
+ msg (<< "~{ChatColor/AQUA}~(-> killer-player .getName)~{ChatColor/RESET} killed a ~{name}")]
(l/post-lingr msg)
(Bukkit/broadcastMessage msg))))))
@@ -59,7 +59,7 @@
(s/replace #"dks" "溺((o(´o`)o))死")
(s/replace #"tkm" (<< "~{ChatColor/MAGIC}匠~{ChatColor/RESET}"))
(s/replace #"^!\?$", "!? な、なんだってーΩ ΩΩ")
- (s/replace #"^!list$" (<< "!list\n~{ChatColor/YELLOW}~(s/join \" \" (map #(.getName %) (Bukkit/getOnlinePlayers)))")))
+ (s/replace #"^!list$" (<< "!list\n~{ChatColor/YELLOW}~(s/join \" \" (map #(-> % .getName) (Bukkit/getOnlinePlayers)))")))
postmsg (<< "<~(-> player .getName)> ~{msg}")]
(.setFormat evt (<< "~{ChatColor/AQUA}<%1$s>~{ChatColor/RESET} %2$s")); by default "<%1$s> %2$s"
(.setMessage evt msg)
@@ -76,52 +76,52 @@
(def hoes #{Material/WOOD_HOE Material/IRON_HOE Material/GOLD_HOE Material/DIAMOND_HOE})
(defn PlayerInteractEvent [^org.bukkit.event.player.PlayerInteractEvent evt]
- (let [player (.getPlayer evt)]
- (condp = (.getAction evt)
+ (let [player (-> evt .getPlayer)]
+ (condp = (-> evt .getAction)
org.bukkit.event.block.Action/LEFT_CLICK_AIR
(when (= "槍" (-> player .getItemInHand .getItemMeta .getDisplayName))
(let [arrow (.launchProjectile player Arrow)]
(later 0
(.setVelocity arrow (.multiply (.getVelocity arrow) 2)))
(later (sec 0.15)
- (when (.isValid arrow)
- (.remove arrow)))))
+ (when (-> arrow .isValid)
+ (-> arrow .remove)))))
org.bukkit.event.block.Action/RIGHT_CLICK_AIR
(when (and (= Material/BOW (-> player .getItemInHand .getType))
(instance? Horse (-> player .getVehicle)))
(let [horse (-> player .getVehicle)
- vel (.getVelocity horse)]
+ vel (-> horse .getVelocity)]
#_(later 0
(l/set-velocity horse
- (* 10 (.getX vel))
- (inc (.getY vel))
- (* 10 (.getZ vel))))))
+ (* 10 (-> vel .getX))
+ (inc (-> vel .getY))
+ (* 10 (-> vel .getZ))))))
org.bukkit.event.block.Action/RIGHT_CLICK_BLOCK
- (let [block (.getClickedBlock evt)]
- (when (and (= Material/SKULL (.getType block))
- (= 1 (.getData block))
+ (let [block (-> evt .getClickedBlock)]
+ (when (and (= Material/SKULL (-> block .getType))
+ (= 1 (-> block .getData))
(= Material/AIR (-> player .getItemInHand .getType)))
(let [[x y z] (let [f (-> evt .getBlockFace)]
- [(.getModX f) (.getModY f) (.getModZ f)])
- block-clicked (.getClickedBlock evt)
+ [(-> f .getModX) (-> f .getModY) (-> f .getModZ)])
+ block-clicked (-> evt .getClickedBlock)
block-below (l/block-below block-clicked)
block-next (-> block-clicked .getLocation (l/sub-loc x y z) .getBlock)
block-belownext (l/block-below block-next)]
- (when (and (= Material/COBBLESTONE (.getType block-below))
+ (when (and (= Material/COBBLESTONE (-> block-below .getType))
(.isTransparent (-> block-next .getType))
(or (.isTransparent (-> block-belownext .getType))
- (and (= Material/STEP (.getType block-belownext))
- (= 3 (.getData block-belownext)))))
+ (and (= Material/STEP (-> block-belownext .getType))
+ (= 3 (-> block-belownext .getData)))))
(doseq [b [block-next block-belownext]
- :when (and (not= Material/STEP (.getType b))
- (not= 3 (.getData b)))]
- (.breakNaturally b))
- (l/block-set block-next (.getType block-clicked) (.getData block-clicked))
- (l/block-set block-belownext (.getType block-below) (.getData block-below))
+ :when (and (not= Material/STEP (-> b .getType))
+ (not= 3 (-> b .getData)))]
+ (-> b .breakNaturally))
+ (l/block-set block-next (-> block-clicked .getType) (-> block-clicked .getData))
+ (l/block-set block-belownext (-> block-below .getType) (-> block-below .getData))
(later 0
(l/block-set block-clicked Material/AIR 0)
(l/block-set block-below Material/STEP 3)))))
- (when (and (= Material/LONG_GRASS (.getType block))
+ (when (and (= Material/LONG_GRASS (-> block .getType))
(contains? hoes (-> player .getItemInHand .getType)))
(.breakNaturally block (-> player .getItemInHand))))
nil)))
@@ -146,8 +146,8 @@
(.breakNaturally b spade))
(-> spade (.setDurability (inc (.getDurability spade))))
(when (< (.getMaxDurability (Material/WOOD_SPADE))
- (.getDurability spade))
- (let [new-value (dec (.getAmount spade))]
+ (-> spade .getDurability))
+ (let [new-value (dec (-> spade .getAmount))]
(if (= new-value 0)
(.setItemInHand player nil)
(.setAmount spade new-value))))))))
@@ -164,39 +164,39 @@
(cloft2.kickory/BlockPhysicsEvent evt block)))
(defn EntityCombustEvent [evt]
- #_(let [entity (.getEntity evt)]
+ #_(let [entity (-> evt .getEntity)]
(when (and (instance? org.bukkit.entity.Item entity)
(= Material/COAL_ORE (-> entity .getItemStack .getType)))
(.setDuration evt 0)
(.setCancelled evt true))))
(defn EntityChangeBlockEvent [^org.bukkit.event.entity.EntityChangeBlockEvent evt]
- (let [entity (.getEntity evt)]
+ (let [entity (-> evt .getEntity)]
(cloft2.kickory/EntityChangeBlockEvent evt entity)
(cloft2.coal/EntityChangeBlockEvent evt entity)))
(defn FurnaceBurnEvent [^org.bukkit.event.inventory.FurnaceBurnEvent evt]
- (let [block (.getBlock evt)]
- (let [fuel (.getFuel evt)]
+ (let [block (-> evt .getBlock)]
+ (let [fuel (-> evt .getFuel)]
(cond
; when it's charcoal
- (and (= Material/COAL (.getType fuel))
+ (and (= Material/COAL (-> fuel .getType))
(= 1 (-> fuel .getData .getData)))
(.setBurnTime evt (sec 20)) ; default is 80
; when it's coal
- (and (= Material/COAL (.getType fuel))
+ (and (= Material/COAL (-> fuel .getType))
(= 0 (-> fuel .getData .getData)))
(.setBurnTime evt (sec 320)) ; default is 80
; when it's coal block
- (= Material/COAL_BLOCK (.getType fuel))
+ (= Material/COAL_BLOCK (-> fuel .getType))
(.setBurnTime evt (sec 1600)) ; default is 800
:else nil))))
(defn ProjectileLaunchEvent [^org.bukkit.event.entity.ProjectileLaunchEvent evt]
- (let [entity (.getEntity evt)
- shooter (.getShooter entity)]
+ (let [entity (-> evt .getEntity)
+ shooter (-> entity .getShooter)]
(when (and (instance? Arrow entity)
- (= Horse (.getVehicle shooter)))
+ (= Horse (-> shooter .getVehicle)))
(.teleport entity (l/add-loc (.getEyeLocation shooter) 0 1.5 0)))))
#_(doseq [nz ['cloft2.fast-dash
@@ -214,18 +214,18 @@
(defn BlockPlaceEvent [^org.bukkit.event.block.BlockPlaceEvent evt]
nil
- #_(let [block (.getBlock evt)]
- (condp = (.getType block)
+ #_(let [block (-> evt .getBlock)]
+ (condp = (-> block .getType)
Material/SAPLING
#_ (Bukkit/broadcastMessage (str (-> block .getState .getData .getSpecies)))
- (later 0 (-> (.getWorld block)
+ (later 0 (-> (-> block .getWorld)
(.generateTree (.getLocation block) org.bukkit.TreeType/COCOA_TREE)))
Material/FENCE
(let [blocks (for [y (range 1 255)
:let [[x z] [(.getX (.getLocation block))
(.getZ (.getLocation block))]
b (.getBlockAt (.getWorld block) x y z)]
- :when (not= Material/BEDROCK (.getType b))]
+ :when (not= Material/BEDROCK (-> b .getType))]
b)]
(later 0
(doseq [b blocks]
@@ -237,7 +237,7 @@
:let [[x z] [(+ x-diff (.getX (.getLocation block)))
(+ z-diff (.getZ (.getLocation block)))]
b (.getBlockAt (.getWorld block) x y z)]
- :when (not (#{Material/AIR Material/BEDROCK} (.getType b)))]
+ :when (not (#{Material/AIR Material/BEDROCK} (-> b .getType)))]
b)]
(.setCancelled evt true)
(later 0
@@ -286,7 +286,7 @@
(Bukkit/addRecipe recipe))
(let [plugin-manager (Bukkit/getPluginManager)
- plugin (-> plugin-manager (.getPlugin "cloft2"))
+ plugin (-> plugin-manager (-> "cloft2" .getPlugin))
ujm (Bukkit/getPlayer "ujm")]
(HandlerList/unregisterAll plugin)
(doseq [[event-class event-f] table
@@ -301,21 +301,21 @@
org.bukkit.event.EventPriority/NORMAL
executer
plugin))
- #_(let [horse (.getVehicle ujm)]
+ #_(let [horse (-> ujm .getVehicle)]
(l/set-velocity horse -10 0 0))
- #_(let [horse (.getVehicle ujm)]
- (.eject horse)
- (.teleport ujm (doto (.getLocation ujm)
- (.setPitch 0)
- (.setYaw 0)))
+ #_(let [horse (-> ujm .getVehicle)]
+ (-> horse .eject)
+ (-> ujm (doto (.getLocation ujm .teleport)
+ (-> 0 .setPitch)
+ (-> 0 .setYaw)))
(.setPassenger horse ujm))
- #_(l/rename (.getItemInHand ujm) "槍")
+ #_(l/rename (-> ujm .getItemInHand) "槍")
- #_(let [horse (l/spawn (.getLocation ujm) org.bukkit.entity.Horse)]
+ #_(let [horse (l/spawn (-> ujm .getLocation) org.bukkit.entity.Horse)]
(later 0
(.setTamed horse true)
(.setOwner horse ujm)))
- #_(prn (some-> ujm .getItemInHand (.setAmount 0))))
+ #_(prn (some-> ujm .getItemInHand (-> 0 .setAmount))))
#_ (later 0 (prn (doto (org.bukkit.WorldCreator. "test")
(.generator (.getGenerator (Bukkit/getWorld "world")))
@@ -324,5 +324,5 @@
(.teleport (.getSpawnLocation (Bukkit/getWorld "test"))))
#_ (prn (Bukkit/getWorlds))
-[(.getName *ns*) 'SUCCESSFULLY-COMPLETED]
+[(-> *ns* .getName) 'SUCCESSFULLY-COMPLETED]
; vim: set lispwords+=later :
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment