Skip to content

Commit 736b9bc

Browse files
KAMKEELKAMKEEL
committed
Merge branch 'rewrite'
2 parents d83a977 + e0af08c commit 736b9bc

74 files changed

Lines changed: 1706 additions & 1617 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ buildscript {
2525

2626
apply plugin: 'forge'
2727

28-
version = "3.2"
28+
version = "4.0"
2929
group= "kamkeel.mpmplus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
3030
archivesBaseName = "MorePlayerModels-Plus"
3131

‎src/main/java/kamkeel/MorePlayerModelsPermissions.java‎

Lines changed: 61 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.minecraft.entity.player.EntityPlayer;
44
import noppes.mpm.MorePlayerModels;
55
import noppes.mpm.config.ConfigMain;
6+
import noppes.mpm.config.ConfigPerm;
67
import org.apache.logging.log4j.LogManager;
78

89
import java.lang.reflect.InvocationTargetException;
@@ -13,30 +14,58 @@
1314

1415

1516
public class MorePlayerModelsPermissions {
16-
public static final Permission CONFIG_SKIN = new Permission("mpm.config.skin");
17-
public static final Permission CONFIG_SOUND = new Permission("mpm.config.sound");
18-
public static final Permission CONFIG_ENTITY = new Permission("mpm.config.entity");
19-
public static final Permission CONFIG_SCALE = new Permission("mpm.config.scale");
20-
public static final Permission CONFIG_HIDE = new Permission("mpm.config.hide");
21-
public static final Permission CONFIG_SAVE = new Permission("mpm.config.save");
22-
public static final Permission CONFIG_LOAD = new Permission("mpm.config.load");
17+
// Config Permissions
18+
public static final Permission CONFIG_SKIN = new Permission("mpm.config.skin", ConfigPerm.CONFIG_SKIN);
19+
public static final Permission CONFIG_SOUND = new Permission("mpm.config.sound", ConfigPerm.CONFIG_SOUND);
20+
public static final Permission CONFIG_ENTITY = new Permission("mpm.config.entity", ConfigPerm.CONFIG_ENTITY);
21+
public static final Permission CONFIG_SCALE = new Permission("mpm.config.scale", ConfigPerm.CONFIG_SCALE);
22+
public static final Permission CONFIG_HIDE = new Permission("mpm.config.hide", ConfigPerm.CONFIG_HIDE);
23+
public static final Permission CONFIG_PRESET = new Permission("mpm.config.preset", ConfigPerm.CONFIG_PRESET);
2324

24-
public static final Permission PARTS = new Permission("mpm.parts");
25-
public static final Permission PARTS_BEARD = new Permission("mpm.parts.beard");
26-
public static final Permission PARTS_BREAST = new Permission("mpm.parts.breast");
27-
public static final Permission PARTS_CAPE = new Permission("mpm.parts.cape");
28-
public static final Permission PARTS_CLAWS = new Permission("mpm.parts.claws");
29-
public static final Permission PARTS_EARS = new Permission("mpm.parts.ears");
30-
public static final Permission PARTS_FIN = new Permission("mpm.parts.fin");
31-
public static final Permission PARTS_HAIR = new Permission("mpm.parts.hair");
32-
public static final Permission PARTS_HORNS = new Permission("mpm.parts.horns");
33-
public static final Permission PARTS_LEGS = new Permission("mpm.parts.legs");
34-
public static final Permission PARTS_MOHAWK = new Permission("mpm.parts.mohawk");
35-
public static final Permission PARTS_PARTICLES = new Permission("mpm.parts.particles");
36-
public static final Permission PARTS_SKIRT = new Permission("mpm.parts.skirt");
37-
public static final Permission PARTS_SNOUT = new Permission("mpm.parts.snout");
38-
public static final Permission PARTS_TAIL = new Permission("mpm.parts.tail");
39-
public static final Permission PARTS_WINGS = new Permission("mpm.parts.wings");
25+
// Part Permissions
26+
public static final Permission PARTS = new Permission("mpm.parts", ConfigPerm.PARTS);
27+
public static final Permission PARTS_BEARD = new Permission("mpm.parts.beard", ConfigPerm.PARTS_BEARD);
28+
public static final Permission PARTS_BREAST = new Permission("mpm.parts.breast", ConfigPerm.PARTS_BREAST);
29+
public static final Permission PARTS_CAPE = new Permission("mpm.parts.cape", ConfigPerm.PARTS_CAPE);
30+
public static final Permission PARTS_CLAWS = new Permission("mpm.parts.claws", ConfigPerm.PARTS_CLAWS);
31+
public static final Permission PARTS_EARS = new Permission("mpm.parts.ears", ConfigPerm.PARTS_EARS);
32+
public static final Permission PARTS_FIN = new Permission("mpm.parts.fin", ConfigPerm.PARTS_FIN);
33+
public static final Permission PARTS_HAIR = new Permission("mpm.parts.hair", ConfigPerm.PARTS_HAIR);
34+
public static final Permission PARTS_HORNS = new Permission("mpm.parts.horns", ConfigPerm.PARTS_HORNS);
35+
public static final Permission PARTS_LEGS = new Permission("mpm.parts.legs", ConfigPerm.PARTS_LEGS);
36+
public static final Permission PARTS_MOHAWK = new Permission("mpm.parts.mohawk", ConfigPerm.PARTS_MOHAWK);
37+
public static final Permission PARTS_PARTICLES = new Permission("mpm.parts.particles", ConfigPerm.PARTS_PARTICLES);
38+
public static final Permission PARTS_SKIRT = new Permission("mpm.parts.skirt", ConfigPerm.PARTS_SKIRT);
39+
public static final Permission PARTS_SNOUT = new Permission("mpm.parts.snout", ConfigPerm.PARTS_SNOUT);
40+
public static final Permission PARTS_TAIL = new Permission("mpm.parts.tail", ConfigPerm.PARTS_TAIL);
41+
public static final Permission PARTS_WINGS = new Permission("mpm.parts.wings", ConfigPerm.PARTS_WINGS);
42+
43+
// Emote Permissions
44+
public static final Permission EMOTE = new Permission("mpm.emote", ConfigPerm.EMOTE);
45+
public static final Permission ANGRY = new Permission("mpm.emote.angry", ConfigPerm.ANGRY);
46+
public static final Permission BOW = new Permission("mpm.emote.bow", ConfigPerm.BOW);
47+
public static final Permission CRAWL = new Permission("mpm.emote.crawl", ConfigPerm.CRAWL);
48+
public static final Permission DANCE = new Permission("mpm.emote.dance", ConfigPerm.DANCE);
49+
public static final Permission DEATH = new Permission("mpm.emote.death", ConfigPerm.DEATH);
50+
public static final Permission HUG = new Permission("mpm.emote.hug", ConfigPerm.HUG);
51+
public static final Permission LOVE = new Permission("mpm.emote.love", ConfigPerm.LOVE);
52+
public static final Permission NO = new Permission("mpm.emote.no", ConfigPerm.NO);
53+
public static final Permission YES = new Permission("mpm.emote.yes", ConfigPerm.YES);
54+
public static final Permission POINT = new Permission("mpm.emote.point", ConfigPerm.POINT);
55+
public static final Permission SING = new Permission("mpm.emote.sing", ConfigPerm.SING);
56+
public static final Permission SIT = new Permission("mpm.emote.sit", ConfigPerm.SIT);
57+
public static final Permission SLEEP = new Permission("mpm.emote.sleep", ConfigPerm.SLEEP);
58+
public static final Permission WAG = new Permission("mpm.emote.wag", ConfigPerm.WAG);
59+
public static final Permission WAVE = new Permission("mpm.emote.wave", ConfigPerm.WAVE);
60+
61+
// Admin Permissions
62+
public static final Permission SETCLOAK = new Permission("mpm.admin.cloak", ConfigPerm.SETCLOAK);
63+
public static final Permission SETMODEL = new Permission("mpm.admin.model", ConfigPerm.SETMODEL);
64+
public static final Permission SETNAME = new Permission("mpm.admin.name", ConfigPerm.SETNAME);
65+
public static final Permission SETURL = new Permission("mpm.admin.url", ConfigPerm.SETURL);
66+
public static final Permission SIZE = new Permission("mpm.admin.size", ConfigPerm.SIZE);
67+
public static final Permission SCALE = new Permission("mpm.admin.scale", ConfigPerm.SCALE);
68+
public static final Permission RELOAD = new Permission("mpm.admin.reload", ConfigPerm.RELOAD);
4069

4170
public static MorePlayerModelsPermissions Instance;
4271
private Class<?> bukkit;
@@ -69,26 +98,15 @@ public static boolean hasPermission(EntityPlayer player, Permission permission){
6998
}
7099
if(player != null){
71100
if(permission != null){
72-
if(Instance.bukkit != null){
73-
return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
101+
if(permission.isAllowed()){
102+
return true;
74103
}
75-
}
76-
}
77-
return true;
78-
}
79-
80-
public static boolean hasPermission(EntityPlayer player, String permission){
81-
if(!ConfigMain.EnablePermissions){
82-
return true;
83-
}
84-
if(player != null){
85-
if(permission != null){
86104
if(Instance.bukkit != null){
87-
return Instance.bukkitPermission(player.getCommandSenderName(), permission);
105+
return Instance.bukkitPermission(player.getCommandSenderName(), permission.name);
88106
}
89107
}
90108
}
91-
return true;
109+
return false;
92110
}
93111

94112
private boolean bukkitPermission(String username, String permission) {
@@ -108,14 +126,18 @@ private boolean bukkitPermission(String username, String permission) {
108126
public static class Permission{
109127
public static final List<Permission> permissionNode = new ArrayList<Permission>();
110128
public static final List<String> permissions = new ArrayList<String>();
129+
public boolean allowed;
111130
public String name;
112-
public Permission(String name){
131+
public Permission(String name, boolean defaultBool){
113132
this.name = name;
133+
this.allowed = defaultBool;
114134
if(!permissions.contains(name)){
115135
permissions.add(name);
116136
permissionNode.add(this);
117137
}
118138
}
139+
140+
public boolean isAllowed(){ return allowed; }
119141
}
120142

121143
public static boolean enabled() {

‎src/main/java/kamkeel/command/CommandMPM.java‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import net.minecraft.server.MinecraftServer;
1010
import net.minecraft.world.World;
1111
import noppes.mpm.ModelData;
12-
import noppes.mpm.PlayerDataController;
1312
import noppes.mpm.Server;
1413
import noppes.mpm.commands.MpmCommandInterface;
1514
import noppes.mpm.constants.EnumAnimation;
16-
import noppes.mpm.constants.EnumPackets;
15+
import noppes.mpm.constants.EnumPacketClient;
16+
import noppes.mpm.controllers.ModelDataController;
1717

1818
import java.lang.reflect.Modifier;
1919
import java.util.*;
@@ -69,26 +69,30 @@ public void processCommand(ICommandSender icommandsender, String[] args) throws
6969
if(player == null)
7070
throw new PlayerNotFoundException("commands.generic.player.notFound", icommandsender);
7171

72-
ModelData data = PlayerDataController.instance.getPlayerData(player);
73-
74-
if(type.equals("url")){
75-
url(player, args, data);
76-
}
77-
else if(type.equals("scale")){
78-
scale(player, args, data);
79-
}
80-
else if(type.equals("name")){
81-
name(player, args, data);
82-
}
83-
else if(type.equals("entity")){
84-
entity(player, args, data);
85-
}
86-
else if(type.equals("animation")){
87-
animation(player, args, data);
88-
}
89-
else if(type.equals("sendmodel")){
90-
sendmodel(player, args, data);
91-
}
72+
ModelData data = ModelData.getData(player);
73+
if(data == null)
74+
return;
75+
76+
switch (type) {
77+
case "url":
78+
url(player, args, data);
79+
break;
80+
case "scale":
81+
scale(player, args, data);
82+
break;
83+
case "name":
84+
name(player, args, data);
85+
break;
86+
case "entity":
87+
entity(player, args, data);
88+
break;
89+
case "animation":
90+
animation(player, args, data);
91+
break;
92+
case "sendmodel":
93+
sendmodel(player, args, data);
94+
break;
95+
}
9296
}
9397

9498
private void animation(EntityPlayer player, String[] args, ModelData data) throws WrongUsageException {
@@ -113,7 +117,7 @@ private void animation(EntityPlayer player, String[] args, ModelData data) throw
113117
animation = EnumAnimation.NONE;
114118
}
115119

116-
Server.sendAssociatedData(player, EnumPackets.ANIMATION, player.getCommandSenderName(), animation);
120+
Server.sendAssociatedData(player, EnumPacketClient.PLAY_ANIMATION, player.getCommandSenderName(), animation);
117121
data.setAnimation(animation.ordinal());
118122
}
119123

@@ -137,7 +141,7 @@ private void entity(EntityPlayer player, String[] args, ModelData data) throws W
137141
}
138142
}
139143

140-
Server.sendAssociatedData(player, EnumPackets.SEND_PLAYER_DATA, player.getCommandSenderName(), data.writeToNBT());
144+
Server.sendAssociatedData(player, EnumPacketClient.SEND_PLAYER_DATA, player.getCommandSenderName(), data.getNBT());
141145
}
142146

143147
private void name(EntityPlayer player, String[] args, ModelData data) throws WrongUsageException {
@@ -160,7 +164,7 @@ private void name(EntityPlayer player, String[] args, ModelData data) throws Wro
160164
if(data.displayName.equalsIgnoreCase("clear"))
161165
data.displayName = "";
162166
player.refreshDisplayName();
163-
Server.sendAssociatedData(player, EnumPackets.SEND_PLAYER_DATA, player.getCommandSenderName(), data.writeToNBT());
167+
Server.sendAssociatedData(player, EnumPacketClient.SEND_PLAYER_DATA, player.getCommandSenderName(), data.getNBT());
164168
}
165169

166170
private void url(EntityPlayer player, String[] args, ModelData data) throws WrongUsageException{
@@ -173,7 +177,7 @@ private void url(EntityPlayer player, String[] args, ModelData data) throws Wron
173177
if(url.equalsIgnoreCase("clear"))
174178
url = "";
175179
data.url = url;
176-
Server.sendAssociatedData(player, EnumPackets.SEND_PLAYER_DATA, player.getCommandSenderName(), data.writeToNBT());
180+
Server.sendAssociatedData(player, EnumPacketClient.SEND_PLAYER_DATA, player.getCommandSenderName(), data.getNBT());
177181
}
178182

179183
private void sendmodel(EntityPlayer fromPlayer, String[] args, ModelData fromData) throws WrongUsageException{
@@ -196,16 +200,16 @@ private void sendmodel(EntityPlayer fromPlayer, String[] args, ModelData fromDat
196200
throw new WrongUsageException("/mpm sendmodel [@from_player] <@to_player> (to go back to default /mpm sendmodel [@p] clear)");
197201
}
198202
else
199-
toData = PlayerDataController.instance.getPlayerData(toPlayer);
203+
toData = ModelData.getData(toPlayer);
200204

201205
if(toData == null){
202206
return;
203207
}
204208

205-
NBTTagCompound compound = fromData.writeToNBT();
206-
toData.readFromNBT(compound);
209+
NBTTagCompound compound = fromData.getNBT();
210+
toData.setNBT(compound);
207211
toData.save();
208-
Server.sendAssociatedData(toPlayer, EnumPackets.SEND_PLAYER_DATA, toPlayer.getCommandSenderName(), compound);
212+
Server.sendAssociatedData(toPlayer, EnumPacketClient.SEND_PLAYER_DATA, toPlayer.getCommandSenderName(), compound);
209213
}
210214

211215
private void scale(EntityPlayer player, String[] args, ModelData data) throws WrongUsageException{
@@ -216,7 +220,7 @@ private void scale(EntityPlayer player, String[] args, ModelData data) throws Wr
216220
data.body.setScale(scale.scaleX, scale.scaleY, scale.scaleZ);
217221
data.arms.setScale(scale.scaleX, scale.scaleY, scale.scaleZ);
218222
data.legs.setScale(scale.scaleX, scale.scaleY, scale.scaleZ);
219-
Server.sendAssociatedData(player, EnumPackets.SEND_PLAYER_DATA, player.getCommandSenderName(), data.writeToNBT());
223+
Server.sendAssociatedData(player, EnumPacketClient.SEND_PLAYER_DATA, player.getCommandSenderName(), data.getNBT());
220224
}
221225
else if(args.length == 4){
222226
Scale scale = Scale.Parse(args[0]);
@@ -229,7 +233,7 @@ else if(args.length == 4){
229233

230234
scale = Scale.Parse(args[3]);
231235
data.legs.setScale(scale.scaleX, scale.scaleY, scale.scaleZ);
232-
Server.sendAssociatedData(player, EnumPackets.SEND_PLAYER_DATA, player.getCommandSenderName(), data.writeToNBT());
236+
Server.sendAssociatedData(player, EnumPacketClient.SEND_PLAYER_DATA, player.getCommandSenderName(), data.getNBT());
233237
}
234238
else{
235239
throw new WrongUsageException("/mpm scale [@p] [head x,y,z] [body x,y,z] [arms x,y,z] [legs x,y,z]. Examples: /mpm scale @p 1, /mpm scale @p 1 1 1 1, /mpm scale 1,1,1 1,1,1 1,1,1 1,1,1");

‎src/main/java/net/minecraft/client/renderer/entity/MPMRendererHelper.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,13 @@ public static ModelBase getMainModel(RendererLivingEntity renderer){
3333
public static void setMainModel(RenderPlayer renderer, ModelMPM modelBipedMain) {
3434
renderer.mainModel = modelBipedMain;
3535
}
36-
37-
public static String getTexture(RendererLivingEntity render, Entity entity){
38-
ResourceLocation location = render.getEntityTexture(entity);
39-
return location.toString();
40-
}
4136

4237
public static ResourceLocation getResource(AbstractClientPlayer player, RendererLivingEntity render, Entity entity){
4338
if(render != null){
4439
try{
4540
return render.getEntityTexture(entity);
4641
}
47-
catch(Exception ex){
48-
49-
}
42+
catch(Exception ex){}
5043
}
5144
return player.getLocationSkin();
5245
}

‎src/main/java/noppes/mpm/CommonProxy.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world,
1818
int x, int y, int z){
1919
return null;
2020
}
21+
22+
public ModelData getClientPlayerData(EntityPlayer player) {
23+
return null;
24+
}
2125

2226
public void load(){
2327
MorePlayerModels.Channel.register(new PacketHandlerServer());

0 commit comments

Comments
 (0)