AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-12 13:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

More progress towards 1.13

Browse Source
This commit is contained in:
ZeroEpoch1969
2018-07-24 19:08:29 -07:00
parent 6275fd8bcb
commit 7170b1c999
29 changed files with 164 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
View File

@ -56,17 +56,11 @@ public class ItemFun extends FreedomService
switch (event.getMaterial())
{
case RAW_FISH:
case TROPICAL_FISH:
{
final int RADIUS_HIT = 5;
final int STRENGTH = 4;
// Clownfish
if (DepreciationAggregator.getData_MaterialData(event.getItem().getData()) != 2)
{
break;
}
if (!plugin.al.isSeniorAdmin(player))
{
final StringBuilder msg = new StringBuilder();
@ -77,7 +71,7 @@ public class ItemFun extends FreedomService
}
player.sendMessage(msg.toString());
player.getEquipment().getItemInMainHand().setType(Material.POTATO_ITEM);
player.getEquipment().getItemInMainHand().setType(Material.POTATO);
break;
}
@ -126,7 +120,7 @@ public class ItemFun extends FreedomService
break;
}
case CARROT_ITEM:
case CARROT:
{
if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
{
@ -214,7 +208,7 @@ public class ItemFun extends FreedomService
break;
}
case SULPHUR:
case GUNPOWDER:
{
if (!fPlayer.isMP44Armed())
{

15
src/main/java/me/totalfreedom/totalfreedommod/fun/Jumppads.java
View File

@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import org.bukkit.Material;
import me.totalfreedom.totalfreedommod.util.MaterialGroup;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -16,7 +16,6 @@ import org.bukkit.util.Vector;
public class Jumppads extends FreedomService
{
public static final Material BLOCK_ID = Material.WOOL;
public static final double DAMPING_COEFFICIENT = 0.8;
//
private final Map<Player, Boolean> pushMap = Maps.newHashMap();
@ -64,7 +63,7 @@ public class Jumppads extends FreedomService
{
canPush = true;
}
if (block.getRelative(0, -1, 0).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(0, -1, 0).getType()))
{
if (canPush)
{
@ -80,29 +79,29 @@ public class Jumppads extends FreedomService
}
else
{
if (block.getRelative(0, -1, 0).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(0, -1, 0).getType()))
{
velocity.add(new Vector(0.0, strength, 0.0));
}
if (mode == JumpPadMode.NORMAL_AND_SIDEWAYS)
{
if (block.getRelative(1, 0, 0).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(1, 0, 0).getType()))
{
velocity.add(new Vector(-DAMPING_COEFFICIENT * strength, 0.0, 0.0));
}
if (block.getRelative(-1, 0, 0).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(-1, 0, 0).getType()))
{
velocity.add(new Vector(DAMPING_COEFFICIENT * strength, 0.0, 0.0));
}
if (block.getRelative(0, 0, 1).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(0, 0, 1).getType()))
{
velocity.add(new Vector(0.0, 0.0, -DAMPING_COEFFICIENT * strength));
}
if (block.getRelative(0, 0, -1).getType() == BLOCK_ID)
if (MaterialGroup.WOOL_COLORS.contains(block.getRelative(0, 0, -1).getType()))
{
velocity.add(new Vector(0.0, 0.0, DAMPING_COEFFICIENT * strength));
}

2
src/main/java/me/totalfreedom/totalfreedommod/fun/MobStacker.java
View File

@ -44,7 +44,7 @@ public class MobStacker extends FreedomService
ItemStack item = attacker.getInventory().getItemInMainHand();
if (item != null && item.getType().equals(Material.POTATO_ITEM))
if (item != null && item.getType().equals(Material.POTATO))
{
event.setCancelled(true);
attacker.addPassenger(event.getEntity());

5
src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java
View File

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.fun;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.util.MaterialGroup;
import me.totalfreedom.totalfreedommod.util.DepreciationAggregator;
import org.bukkit.Location;
import org.bukkit.Material;
@ -10,7 +11,6 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerMoveEvent;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
@ -66,8 +66,7 @@ public class Trailer extends FreedomService
}
final Location location = fromBlock.getLocation();
fromBlock.setType(Material.WOOL);
DepreciationAggregator.setData_Block(fromBlock, (byte) random.nextInt(16));
fromBlock.setType(MaterialGroup.WOOL_COLORS.get(random.nextInt(MaterialGroup.WOOL_COLORS.size())));
byte data = DepreciationAggregator.getData_Block(fromBlock);
Material material = Material.getMaterial(String.valueOf(fromBlock.getType()));
for (int x = -1; x <= 1; x++)