Skip to content

Commit

Permalink
Week #2 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
North-West-Wind committed Dec 7, 2020
1 parent a4fba4a commit 1788791
Show file tree
Hide file tree
Showing 16 changed files with 161 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'

version = '1.1.0-1.16.x'
version = '1.2.0-1.16.x'
group = 'com.northwestwind.moreboots' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'moreboots'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,7 @@ public void onLivingUpdate(final LivingEvent.LivingUpdateEvent event) {
entity.setPositionAndUpdate(entity.getPosX(), pos.getY() + 1, entity.getPosZ());
}
} else if (boots.getItem().equals(ItemInit.SPIDER_BOOTS)) {
if (Utils.isSurroundedByInvalidBlocks(entity) || entity.isInLava() || entity.isInWater() || entity.isSpectator() || entity.func_233570_aj_()) {
tag.putBoolean("climable", false);
boots.setTag(tag);
} else if (entity.collidedHorizontally) {
tag.putBoolean("climable", true);
boots.setTag(tag);
}
boolean climable = tag.getBoolean("climable");
boolean climable = !Utils.isSurroundedByInvalidBlocks(entity) && !entity.isInLava() && !entity.isInWater() && !entity.isSpectator() && !entity.func_233570_aj_();
Vector3d motion = entity.getMotion();
motion = motion.mul(1, 0, 1);
boolean ascending = entity.collidedHorizontally;
Expand Down Expand Up @@ -291,7 +284,7 @@ public void onLivingUpdate(final LivingEvent.LivingUpdateEvent event) {
boots.setDamage(boots.getMaxDamage());
entity.world.createExplosion(entity, pos.x, entity.getPosYHeight(-0.0625D), pos.z, 10.0F, Explosion.Mode.BREAK);
entity.setMotion(entity.getMotion().add(0, 0.01 * 864000, 0));
if (entity instanceof PlayerEntity) {
if (entity instanceof PlayerEntity && !entity.world.isRemote) {
MinecraftServer server = entity.world.getServer();
ServerPlayerEntity serverPlayerEntity = (ServerPlayerEntity) entity;
serverPlayerEntity.getAdvancements().grantCriterion(server.getAdvancementManager().getAdvancement(new ResourceLocation("moreboots", "moreboots/twelve_hours")), "twelve_hours");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void handle(final NetworkEvent.Context ctx) {
ItemStack boots = player.getItemStackFromSlot(EquipmentSlotType.FEET);
if(!boots.getItem().equals(ItemInit.KA_BOOTS)) return;
BlockPos pos = new BlockPos(player.getPositionVec());
AxisAlignedBB area = new AxisAlignedBB(pos).expand(8, 8, 8);
AxisAlignedBB area = new AxisAlignedBB(pos).grow(4);
List<Entity> collidedEntities = player.world.getEntitiesInAABBexcluding(player, area, EntityPredicates.NOT_SPECTATING);
LivingEntity closest = null;
for (Entity entity : collidedEntities) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
modLoader="javafml"
loaderVersion="[32,35)"
loaderVersion="[32,35]"
license="MIT"
issueTrackerURL="https://github.com/North-West-Wind/MoreBoots/issues"

[[mods]]
modId="moreboots"
version="1.1.0"
version="1.2.0"
displayName="More Boots"
updateJSONURL="https://github.com/North-West-Wind/MoreBoots/raw/main/update.json"
displayURL="https://github.com/North-West-Wind/MoreBoots"
Expand All @@ -20,13 +20,13 @@ Oh, you love shoes? Name every boots in this mod.
[[dependencies.moreboots]]
modId="forge"
mandatory=true
versionRange="[32,35)"
versionRange="[32,35]"
ordering="NONE"
side="BOTH"

[[dependencies.moreboots]]
modId="minecraft"
mandatory=true
versionRange="[1.16.1,1.16.4)"
versionRange="[1.16.1,1.16.4]"
ordering="NONE"
side="BOTH"
8 changes: 8 additions & 0 deletions src/main/resources/assets/moreboots/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"item.moreboots.windy_boots": "Windy Boots",
"item.moreboots.skating_boots": "Skater",
"item.moreboots.prismarine_boots": "Prismarine Boots",
"item.moreboots.bat_boots": "Bat Boots",
"item.moreboots.ka_boots": "Kill Aura Boots",

"item.moreboots.quartz_ingot": "Quartz Ingot",
"item.moreboots.metal_mix": "Metal Mix",
Expand Down Expand Up @@ -75,6 +77,8 @@
"tooltip.moreboots.windy_boots": "\u00A77\u00A7oGains velocity in the air",
"tooltip.moreboots.skating_boots": "\u00A77\u00A7oSneak to skate on ice",
"tooltip.moreboots.prismarine_boots": "\u00A77\u00A7oSwims extremely fast",
"tooltip.moreboots.bat_boots": "\u00A77\u00A7oWalks on ceiling",
"tooltip.moreboots.ka_boots": "\u00A77\u00A7oHelps with your aim",
"itemGroup.morebootstab": "More Boots",

"death.attack.stomp": "%1$s was stomped by %2$s",
Expand Down Expand Up @@ -140,6 +144,10 @@
"advancements.moreboots.prismarine_boots.description": "Obtain the Prismarine Boots",
"advancements.moreboots.windy_boots.title": "Not Gliding",
"advancements.moreboots.windy_boots.description": "Obtain the Windy Boots",
"advancements.moreboots.bat_boots.title": "BATMAN!!!",
"advancements.moreboots.bat_boots.description": "Obtain the Bat Boots",
"advancements.moreboots.ka_boots.title": "Please Stop Hacking",
"advancements.moreboots.ka_boots.description": "Obtain the Kill Aura Boots",

"key.categories.moreboots": "More Boots",
"key.moreboots.teleport": "Ender Boots Teleport"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "moreboots:items/bat_boots"
}
}
6 changes: 6 additions & 0 deletions src/main/resources/assets/moreboots/models/item/ka_boots.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "moreboots:items/ka_boots"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parent": "moreboots:moreboots/slime_boots",
"display": {
"icon": {
"item": "moreboots:bat_boots",
"nbt": "{Damage:0}"
},
"title": {
"translate": "advancements.moreboots.bat_boots.title"
},
"description": {
"translate": "advancements.moreboots.bat_boots.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"bat_boots": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "moreboots:bat_boots"
}
]
}
}
},
"requirements": [
[
"bat_boots"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parent": "moreboots:moreboots/root",
"display": {
"icon": {
"item": "moreboots:ka_boots",
"nbt": "{Damage:0}"
},
"title": {
"translate": "advancements.moreboots.ka_boots.title"
},
"description": {
"translate": "advancements.moreboots.ka_boots.description"
},
"frame": "task",
"show_toast": true,
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"ka_boots": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "moreboots:ka_boots"
}
]
}
}
},
"requirements": [
[
"ka_boots"
]
]
}
16 changes: 16 additions & 0 deletions src/main/resources/data/moreboots/recipes/bat_boots.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"# #",
"# #"
],
"key": {
"#": {
"item": "moreboots:bat_hide"
}
},
"result": {
"item": "moreboots:bat_boots",
"count": 1
}
}
29 changes: 29 additions & 0 deletions src/main/resources/data/moreboots/recipes/ka_boots.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" # ",
"GND",
" I "
],
"key": {
"#": {
"item": "minecraft:netherite_sword"
},
"G": {
"item": "minecraft:golden_sword"
},
"N": {
"item": "minecraft:netherite_boots"
},
"D": {
"item": "minecraft:diamond_sword"
},
"I": {
"item": "minecraft:iron_sword"
}
},
"result": {
"item": "moreboots:ka_boots",
"count": 1
}
}
28 changes: 16 additions & 12 deletions update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,35 @@
"1.16.4": {
"1.0.0": "The very first release",
"1.0.1": "Fixed furnace recipe",
"1.1.0": "Week #1 Update"
"1.1.0": "Week #1 Update",
"1.2.0": "Week #2 Update"
},
"1.16.3": {
"1.0.0": "The very first release",
"1.0.1": "Fixed furnace recipe",
"1.1.0": "Week #1 Update"
"1.1.0": "Week #1 Update",
"1.2.0": "Week #2 Update"
},
"1.16.2": {
"1.0.0": "The very first release",
"1.0.1": "Fixed furnace recipe",
"1.1.0": "Week #1 Update"
"1.1.0": "Week #1 Update",
"1.2.0": "Week #2 Update"
},
"1.16.1": {
"1.0.0": "The very first release",
"1.0.1": "Fixed furnace recipe",
"1.1.0": "Week #1 Update"
"1.1.0": "Week #1 Update",
"1.2.0": "Week #2 Update"
},
"promos": {
"1.16.4-latest": "1.1.0",
"1.16.4-recommended": "1.1.0",
"1.16.3-latest": "1.1.0",
"1.16.3-recommended": "1.1.0",
"1.16.2-latest": "1.1.0",
"1.16.2-recommended": "1.1.0",
"1.16.1-latest": "1.1.0",
"1.16.1-recommended": "1.1.0"
"1.16.4-latest": "1.2.0",
"1.16.4-recommended": "1.2.0",
"1.16.3-latest": "1.2.0",
"1.16.3-recommended": "1.2.0",
"1.16.2-latest": "1.2.0",
"1.16.2-recommended": "1.2.0",
"1.16.1-latest": "1.2.0",
"1.16.1-recommended": "1.2.0"
}
}

0 comments on commit 1788791

Please sign in to comment.