Skip to content

Commit

Permalink
updated to new ObjD Version/add Mason Recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
d0mmi committed Aug 20, 2019
1 parent 1f179bd commit 1d668fd
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 24 deletions.
Binary file modified .dart_tool/pub/bin/objd/new.dart.snapshot.dart2
Binary file not shown.
Binary file modified .dart_tool/pub/bin/objd/objd.dart.snapshot.dart2
Binary file not shown.
Binary file modified .dart_tool/pub/bin/objd/run.dart.snapshot.dart2
Binary file not shown.
Binary file modified .dart_tool/pub/bin/objd/serve.dart.snapshot.dart2
Binary file not shown.
2 changes: 1 addition & 1 deletion .dart_tool/pub/bin/sdk-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.0
2.4.0
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.dart_tool/
.packages
pubspec.lock
villagercrafting/
19 changes: 10 additions & 9 deletions .packages
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Generated by pub on 2019-03-29 14:47:58.159913.
async:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-2.1.0/lib/
collection:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.11/lib/
colorize:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/colorize-2.0.0/lib/
meta:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.7/lib/
objd:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/objd-0.1.2/lib/
path:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.6.2/lib/
watcher:file:///C:/Users/DommiHD/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib/
towerdefense:lib/
# Generated by pub on 2019-08-20 13:29:34.892559.
async:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/async-2.3.0/lib/
collection:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/collection-1.14.12/lib/
colorize:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/colorize-2.0.0/lib/
meta:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/meta-1.1.7/lib/
objd:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/objd-0.2.4/lib/
path:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/path-1.6.4/lib/
pedantic:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/pedantic-1.8.0+1/lib/
watcher:file:///C:/Users/d.klysch/AppData/Roaming/Pub/Cache/hosted/pub.dartlang.org/watcher-0.9.7+12/lib/
villagercrafting:lib/
4 changes: 2 additions & 2 deletions bin/VillagerRecipe.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class VillagerProfession{
Widget getRecipes(){
String professionName = profession.toString().substring(10);
return Execute.asat(Entity(type: EntityType.villager, nbt: {"VillagerData":{"profession":profession.toString()}}),children: [
File.execute(path: "recipes/"+professionName+"/main",child: For.of(professionRecipes))
File.execute("recipes/"+professionName+"/main",child: For.of(professionRecipes))
]);
}

Expand Down Expand Up @@ -78,7 +78,7 @@ class VillagerRecipe{
for(int i = level.from; i <= level.to;i++){
profession.professionRecipes.add(
Execute.asat(Entity.Selected(nbt: {"VillagerData":{"level":i}}),children: [
File.execute(path: "recipes/"+professionName+"/"+i.toString()+"/"+professionName+profession.recipecount.toString(), child: For.of([
File.execute("recipes/"+professionName+"/"+i.toString()+"/"+professionName+profession.recipecount.toString(), child: For.of([
If(workCon, assignTag: Entity(selector: 's'), Then: [
If(Condition.and(conditions),assignTag: Entity(selector: 's'),Then: then)
])]))
Expand Down
9 changes: 5 additions & 4 deletions bin/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ void main(){
createProject(
Project(
name:"villagercrafting",
target:"../",
target:"./",
generate: VillagerWidget(),
description: "{\"pack\": {\"pack_format\": 1, \"description\": \"Villager Crafting Datapack by D0mmi\"}}"
)
Expand Down Expand Up @@ -106,6 +106,7 @@ class VillagerWidget extends Widget {

VillagerRecipe([Item(Block.stone,count: 6)], [Item(Block.stone_stairs,count: 4)], VillagerProfession.mason, Range(from: 1));
VillagerRecipe([Item(Block.stone,count: 3)], [Item(Block.stone_slab,count: 6)], VillagerProfession.mason, Range(from: 1));
VillagerRecipe([Item(Block.stone,count: 4)], [Item(Block.stone_bricks,count: 4)], VillagerProfession.mason, Range(from: 1));

VillagerRecipe([Item(Block.smooth_stone,count: 3)], [Item(Block.smooth_stone_slab,count: 6)], VillagerProfession.mason, Range(from: 1));

Expand Down Expand Up @@ -154,13 +155,13 @@ class VillagerWidget extends Widget {
return Pack(
name: "villagercrafting",
main: File(
path: 'main',
'main',
child: For.of(recipes)
),
load: File(
path: 'load',
'load',
child: For.of([
Tellraw(Entity.All(),show: [TextComponent("Villager Crafting v1.3 by ",color: Color.Gold),TextComponent("D0mmi",color: Color.Aqua,clickEvent: TextClickEvent.open_url("https://github.com/d0mmi")),TextComponent(" Loaded!",color: Color.Gold)]),
Tellraw(Entity.All(),show: [TextComponent("Villager Crafting v1.4 by ",color: Color.Gold),TextComponent("D0mmi",color: Color.Aqua,clickEvent: TextClickEvent.open_url("https://github.com/d0mmi")),TextComponent(" Loaded!",color: Color.Gold)]),
Tellraw(Entity.All(),show: [TextComponent("Submit Bugs or Suggestions ",color: Color.Gold),TextComponent("here!",color: Color.Aqua,clickEvent: TextClickEvent.open_url("https://github.com/d0mmi/VillagerCraftingDatapack/issues/new"))]),
])
)
Expand Down
21 changes: 14 additions & 7 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# Generated by pub
# See https://www.dartlang.org/tools/pub/glossary#lockfile
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.3.0"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.14.11"
version: "1.14.12"
colorize:
dependency: transitive
description:
Expand All @@ -35,20 +35,27 @@ packages:
name: objd
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "0.2.4"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.2"
version: "1.6.4"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0+1"
watcher:
dependency: transitive
description:
name: watcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.7+10"
version: "0.9.7+12"
sdks:
dart: ">=2.0.0 <3.0.0"
dart: ">=2.3.0 <3.0.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name: "villagercrafting"
dependencies:
objd: ^0.1.0
objd:

0 comments on commit 1d668fd

Please sign in to comment.