mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-17 19:25:06 +00:00
Fix up issues with removing variations
This commit is contained in:
1 parent
48274f1e22
commit
daae37e36d
2 files changed
+23
-5
No files matched your search
+21
-1
@@ -18,7 +18,7 @@ buildscript {
|
||||
}
|
||||
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'maven-publish'
|
||||
apply plugin: 'curseforge'
|
||||
|
||||
import org.ajoberstar.grgit.Grgit
|
||||
@@ -109,6 +109,26 @@ artifacts {
|
||||
archives apiJar
|
||||
}
|
||||
|
||||
publishing {
|
||||
tasks.publish.dependsOn 'build'
|
||||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
from components.java
|
||||
|
||||
artifact sourcesJar
|
||||
artifact apiJar
|
||||
artifact deobfJar
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
String prop = dev ? "chisel_mavendir" : "chisel_mavendir_dev"
|
||||
if (project.hasProperty(prop)) {
|
||||
maven { url project.getProperty(prop) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String getChangelogText() {
|
||||
def changelogFile = new File('changelog')
|
||||
String str = ''
|
||||
|
||||
@@ -227,10 +227,8 @@ public class GroupList implements Set<ICarvingGroup> {
|
||||
}
|
||||
List<VariationWrapper> toRemove = Lists.newArrayList();
|
||||
for (VariationWrapper v : lookup.keySet()) {
|
||||
if ((g == null || lookup.get(v) == g) && v.v.getBlock() == block && v.v.getBlockMeta() == metadata) {
|
||||
if (g != null) {
|
||||
g.removeVariation(v.v);
|
||||
}
|
||||
if ((g == null || lookup.get(v).getName().equals(g.getName())) && v.equals(new VariationWrapper(new VariationKey(block, metadata)))) {
|
||||
lookup.get(v).removeVariation(v.v);
|
||||
toRemove.add(v);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user