Compare commits

...

15 commits

Author SHA1 Message Date
a10a10e668 Fixed typo 2020-11-06 15:59:26 +01:00
6bb38b43c6 Updated mod to V1.6
Added MC 1.16.4 support
Better direction lock descriptions
Removed stray English words in German translation

# Conflicts:
#	gradle.properties
#	src/main/resources/META-INF/mods.toml
2020-11-06 15:56:19 +01:00
c16d1d22ac
Merge pull request #25 from Theta-Dev/update_1.5
Update 1.5 -> 1.16.1
2020-09-29 22:47:39 +02:00
b848742f90
Merge branch '1.16' into update_1.5 2020-09-29 22:47:29 +02:00
3aee9629df Fixed stack overflow when placing many connecting blocks (1.16) 2020-09-18 22:29:53 +02:00
40a4df7a20 Changed readme 2020-09-18 13:06:12 +02:00
7b291d514f Changed botania version 2020-09-18 00:20:09 +02:00
0d90de89cf
Removed duplicate forge declaration 2020-09-17 23:26:40 +02:00
9aec266dd2 Set mc/forge version 2020-09-17 23:17:02 +02:00
0ca8f23b69
Merge pull request #21 from Theta-Dev/update1.3
Update1.3 -> 1.16
2020-09-17 23:03:50 +02:00
e4ca89680d
Merge branch '1.16' into update1.3 2020-09-17 23:03:42 +02:00
d87c7f7d1b fix exception with no-collision blocks 2020-08-27 00:10:38 +02:00
20b016dd57
Merge pull request #17 from Theta-Dev/fix_collision
Fix collision
2020-08-26 23:51:57 +02:00
95d3c504ba
Merge branch '1.16' into fix_collision 2020-08-26 23:51:47 +02:00
1186043bf3 placement dir improvements 2020-08-26 17:18:54 +02:00
7 changed files with 36 additions and 31 deletions

3
.gitignore vendored
View file

@ -24,4 +24,5 @@ run
# Files from Forge MDK
forge*changelog.txt
.cache
.cache
logs

View file

@ -104,6 +104,10 @@ dependencies {
version: "${project.botania}",
classifier: "api"
])
//runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-39")
//runtimeOnly fg.deobf("top.theillusivec4.curios:curios:FORGE-1.16.1-3.0")
//runtimeOnly fg.deobf("vazkii.botania:Botania:1.16-398")
}
jar {
@ -137,4 +141,4 @@ publishing {
url "file:///${project.projectDir}/mcmodsrepo"
}
}
}
}

View file

@ -4,11 +4,11 @@ org.gradle.daemon=false
author=thetadev
modid=constructionwand
mcversion=1.16.2
forgeversion=33.0.60
mcversion=1.16.1
forgeversion=32.0.108
mcp_mappings=20200723-1.16.1
botania=1.16.2-405
botania=1.16-398
version_major=1
version_minor=5
version_minor=6

View file

@ -233,7 +233,7 @@ public abstract class WandJob
// Draw item from pool (returns null if none are left)
BlockItem item = itemPool.draw();
if(item == null) return null;
int count = itemCounts.get(item);
if(count == 0) continue;
@ -295,7 +295,7 @@ public abstract class WandJob
}
// Remove block if placeEvent is canceled
BlockSnapshot snapshot = BlockSnapshot.create(world.func_234923_W_(), world, blockPos);
BlockSnapshot snapshot = BlockSnapshot.create(world, blockPos);
BlockEvent.EntityPlaceEvent placeEvent = new BlockEvent.EntityPlaceEvent(snapshot, placeBlock, player);
MinecraftForge.EVENT_BUS.post(placeEvent);
if(placeEvent.isCanceled()) {

View file

@ -1,13 +1,13 @@
modLoader="javafml"
loaderVersion="[33,)"
loaderVersion="[32,)"
license="MIT License"
[[mods]]
modId="constructionwand"
version="${file.jarVersion}"
displayName="Construction Wand"
displayURL="https://github.com/Theta-Dev/ConstructionWand" #optional
logoFile="logo.png" #optional
authors="ThetaDev" #optional
displayURL="https://github.com/Theta-Dev/ConstructionWand"
logoFile="logo.png"
authors="ThetaDev"
description='''
Construction Wands make building easier!
@ -20,12 +20,12 @@ This is my first minecraft mod. May the odds be ever in your favor.
[[dependencies.constructionwand]]
modId="forge"
mandatory=true
versionRange="[33,)"
versionRange="[32,)"
ordering="NONE"
side="BOTH"
[[dependencies.constructionwand]]
modId="minecraft"
mandatory=true
versionRange="[1.16.2, 1.16.3]"
versionRange="[1.16.1]"
ordering="NONE"
side="BOTH"

View file

@ -15,13 +15,13 @@
"constructionwand.option.lock": "Beschränkung: ",
"constructionwand.option.lock.horizontal": "§aHorizontal",
"constructionwand.option.lock.horizontal.desc": "Erweitert nach §arechts/links§f. Baut nicht auf der Ober/Unterseite",
"constructionwand.option.lock.horizontal.desc": "Baut eine horizontale Säule vor dem Originalblock",
"constructionwand.option.lock.vertical": "§aVertikal",
"constructionwand.option.lock.vertical.desc": "Erweitert nach §aoben/unten§f. Baut nicht auf der Ober/Unterseite",
"constructionwand.option.lock.northsouth": "§6North/South",
"constructionwand.option.lock.northsouth.desc": "Erweitert nach §aNorden/Süden§f. Baut nicht an den Seitenflächen",
"constructionwand.option.lock.eastwest": "§6East/West",
"constructionwand.option.lock.eastwest.desc": "Erweitert nach §aOsten/Westen§f. Baut nicht an den Seitenflächen",
"constructionwand.option.lock.vertical.desc": "Baut eine vertikale Säule vor dem Originalblock",
"constructionwand.option.lock.northsouth": "§6Nord/Süd",
"constructionwand.option.lock.northsouth.desc": "Baut eine Reihe in NS-Richtung auf dem Originalblock",
"constructionwand.option.lock.eastwest": "§6Ost/West",
"constructionwand.option.lock.eastwest.desc": "Baut eine Reihe in OW-Richtung auf dem Originalblock",
"constructionwand.option.lock.nolock": "§cKeine",
"constructionwand.option.lock.nolock.desc": "Erweitert in jede Richtung",
@ -29,7 +29,7 @@
"constructionwand.option.direction.target": "§6Zielblock",
"constructionwand.option.direction.target.desc": "Platziert Blöcke mit der selben Ausrichtung wie der Zielblock",
"constructionwand.option.direction.player": "§aSpieler",
"constructionwand.option.direction.player.desc": "Place blocks facing the player",
"constructionwand.option.direction.player.desc": "Platziert Blöcke in der Richtung, auf die der Spieler zeigt",
"constructionwand.option.replace": "Ersetzen: ",
"constructionwand.option.replace.yes": "§aJa",
@ -45,11 +45,11 @@
"constructionwand.option.match.any": "§cAlle",
"constructionwand.option.match.any.desc": "Erweitert alle Blöcke",
"constructionwand.option.random": "Zufall: ",
"constructionwand.option.random.yes": "§aJa",
"constructionwand.option.random": "Zufallsmodus: ",
"constructionwand.option.random.yes": "§aEin",
"constructionwand.option.random.yes.desc": "Platziere zufällige Blöcke aus der Hotbar",
"constructionwand.option.random.no": "§cNein",
"constructionwand.option.random.no.desc": "Platziere Blöcke nicht zufällig",
"constructionwand.option.random.no": "§cAus",
"constructionwand.option.random.no.desc": "Platziere Blöcke normal",
"stat.constructionwand.use_wand": "Blöcke mithilfe des Stabs platziert"
}

View file

@ -14,14 +14,14 @@
"constructionwand.option.mode.angel.desc": "Place behind blocks and in mid air",
"constructionwand.option.lock": "Restriction: ",
"constructionwand.option.lock.horizontal": "§aHorizontal",
"constructionwand.option.lock.horizontal.desc": "Extend §aleft/right§f from the original block. No building on top/bottom face",
"constructionwand.option.lock.vertical": "§aVertical",
"constructionwand.option.lock.vertical.desc": "Extend §aup/down§f from the original block. No building on top/bottom face",
"constructionwand.option.lock.horizontal": "§aLeft/Right",
"constructionwand.option.lock.horizontal.desc": "Build a horizontal column in front of the original block",
"constructionwand.option.lock.vertical": "§aUp/Down",
"constructionwand.option.lock.vertical.desc": "Build a vertical column in front of the original block",
"constructionwand.option.lock.northsouth": "§6North/South",
"constructionwand.option.lock.northsouth.desc": "Extend §anorth/south§f on top of the original block. No building on side faces",
"constructionwand.option.lock.northsouth.desc": "Build a row in N/S direction on top of the original block",
"constructionwand.option.lock.eastwest": "§6East/West",
"constructionwand.option.lock.eastwest.desc": "Extend §aeast/west§f on top of the original block. No building on side faces",
"constructionwand.option.lock.eastwest.desc": "Build a row in E/W direction on top of the original block",
"constructionwand.option.lock.nolock": "§cNone",
"constructionwand.option.lock.nolock.desc": "Extend from any side of the original block",