Skip to content

Commit

Permalink
update to latest fabric, add nearbypage as well
Browse files Browse the repository at this point in the history
  • Loading branch information
insanj committed Apr 25, 2019
1 parent 3996e4a commit faf3e60
Show file tree
Hide file tree
Showing 7 changed files with 170 additions and 125 deletions.
9 changes: 5 additions & 4 deletions plugin/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=19w12b
yarn_mappings=19w12b.9
loader_version=0.3.7.109
minecraft_version=1.14
yarn_mappings=1.14+build.2
loader_version=0.4.0+build.121

# Mod Properties
mod_version = 0.5.4
mod_version = 0.5.5
maven_group = com.insanj
archives_base_name = pride

# Dependencies
# https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.2.5.114

3 changes: 1 addition & 2 deletions plugin/src/main/java/com/insanj/pride/PrideBlockPosUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
import net.minecraft.world.World;
import net.minecraft.world.chunk.ChunkManager;
import net.minecraft.world.chunk.ChunkPos;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandManager;
import net.minecraft.server.MinecraftServer;;
import net.minecraft.text.StringTextComponent;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
Expand Down
227 changes: 121 additions & 106 deletions plugin/src/main/java/com/insanj/pride/PrideCommandExecutor.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import net.minecraft.world.chunk.ChunkManager;
import net.minecraft.world.chunk.ChunkPos;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandManager;
import net.minecraft.text.StringTextComponent;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/com/insanj/pride/PrideMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;

import net.minecraft.server.command.ServerCommandManager;
import net.minecraft.server.command.CommandManager;
import net.minecraft.text.StringTextComponent;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;

import net.minecraft.server.command.ServerCommandManager;
import net.minecraft.server.command.CommandManager;
import net.minecraft.text.StringTextComponent;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.block.BlockItem;
import net.minecraft.block.Block;
import net.minecraft.block.Material;
import net.minecraft.inventory.Inventory;
Expand All @@ -41,10 +40,7 @@
import net.minecraft.entity.attribute.EntityAttributeModifier;
import net.minecraft.entity.attribute.EntityAttributes;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.block.BlockItem;

import net.minecraft.item.MiningToolItem;
import net.minecraft.server.world.BlockAction;
import net.minecraft.sound.SoundEvents;
Expand Down
45 changes: 40 additions & 5 deletions plugin/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,48 @@
{
"schemaVersion": 1,
"id": "pride",
"version": "${version}",

"name": "pride",
"icon": "assets/pride/icon.png",
"description": "keep track of your playmates in minecraft\nSettle your current area to Pride\n/settle <name>\ntrigger:\ndescription: Toggle trigger setting for an area\nusage: |\nToggle trigger setting for an area\n/trigger <name>\nabandon:\ndescription: Abandon a given area in Pride\nusage: |\nAbandon a given area in Pride\n/abandon <name>\nhere:\ndescription: Show every Pride area where you currently are\nusage: |\nShow every Pride area where you currently are\n/here <optional:username>\nfar:\ndescription: Calculate how far away you are from a Pride area\nusage: |\nCalculate how far away you are from a Pride area\n/far <name>\nareas:\ndescription: Show the names of all the Pride areas and how far away they are\nusage: |\nShow the names of all the Pride areas and how far away they are\n/areas\nbetween:\ndescription: Calculate the distance between two pride areas (> 256 for Nether Portals)\nusage: |\nCalculate the distance between two pride areas (> 256 for Nether Portals)\n/between <name_one>,<name_two>\ncompass:\ndescription: Point your compass towards an area. Will reset to original spawn if no argument is given\nusage: |\nPoint your compass towards an area. Will reset to original spawn if no argument is given\n/compass <area>\nnorth:\ndescription: Point your compass towards true north. Will reset if any argument is given\nusage: |\nPoint your compass towards true north. Will reset if any argument is given\n/north <reset>",
"version": "${version}",
"side": "server",
"initializers": [
"com.insanj.pride.PrideMod"


"authors": [
{
"name": "Julian (insanj) Weiss",
"contact": {
"email": "[email protected]",
"homepage": "https://insanj.github.io/pride/",
"issues": "https://github.com/insanj/pride/issues",
"sources": "https://github.com/insanj/pride/"
}
}
],
"requires": {


"license": "MIT",
"contact": {
"email": "[email protected]",
"homepage": "https://insanj.github.io/pride/",
"issues": "https://github.com/insanj/pride/issues",
"sources": "https://github.com/insanj/pride/"
},

"environment": "*",
"entrypoints": {
"main": [
"com.insanj.pride.PrideMod"
]
},

"requires" : {
"fabricloader": ">=0.4.0",
"fabric": "*"
},
"depends": {
"fabricloader": ">=0.4.0",
"fabric": "*"
}
}

0 comments on commit faf3e60

Please sign in to comment.