Skip to content

Issues 96 and 98 #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hi-im-aren wants to merge 17 commits into
base: develop
Choose a base branch
from
Open

Issues 96 and 98 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
270c940
Update README.md
geryxyz Feb 16, 2017
0432da3
Update README.md
geryxyz Feb 16, 2017
70f2b85
test
dhirling Apr 20, 2017
7903e33
enabled the usage of pigs
dhirling Apr 21, 2017
edf194f
biome - rendering
herdinaik Apr 21, 2017
15beb98
added biome id-s
dhirling Apr 21, 2017
e1cc3ec
Add Mobs support to Rendering
Apr 21, 2017
6069b90
Add additional Mob support to Mapping
Apr 21, 2017
92c6bf8
WorldBuilder useless attributum deleted, and made a biomeid try catch…
Vini1424 Apr 22, 2017
10eba5b
Removed unnecessary lines of code
dhirling Apr 22, 2017
53b5d8f
Removed unnecessary lines of code
dhirling Apr 22, 2017
18bb1eb
change pigs to pig
Vini1424 Apr 22, 2017
8dcb33f
Merge branch 'OS-CodeMetropolis' of https://github.com/naradrinis/Cod…
Vini1424 Apr 22, 2017
ec6c996
change pigs to pig
Vini1424 Apr 22, 2017
c06ef40
xml example fix
Vini1424 Apr 22, 2017
2efca8f
Mobs HotFix
May 2, 2017
836b240
Remove gates for the request of the project owner so mobs dont walk o…
May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ CodeMetropolis
See your software as never before.

Official community page: https://plus.google.com/communities/110235162339639686953

BlockModifier-API aviable at: https://github.com/blip24/BlockModifier-API
hh
Binary file modified dependencies/codemetropolis/cmblockmodifier/1.0.1/cmblockmodifier-1.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added dependencies/codemetropolis/cmblockmodifier/1.0.1/sav/cmblockmodifier-1.0.1.jar
View file
Open in desktop
Binary file not shown.
25 changes: 23 additions & 2 deletions examples/mapping/sonarqube_mapping_example_1_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
<mapping version="1.0">
<linking>
<source name="prj" from="" />
<target name="garden" to="" />
<source name="prj" from="directories" />
<target name="ground" to="biome-id" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</linking>
<linking>
<source name="prj" from="bugs" />
<target name="garden" to="pig" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1" />
<parameter name="level1" value="2" />
<parameter name="level2" value="3" />
<parameter name="level3" value="4" />
<parameter name="level4" value="5" />
</conversion>
</conversions>
</linking>
<linking>
<source name="dir" from="files" />
Expand Down
24 changes: 24 additions & 0 deletions examples/mapping/sonarqube_mapping_example_2_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
<mapping version="2.0">
<linking source="prj" target="ground"/>
<binding from="directories" to="biome-id">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="prj" target="garden"/>
<binding from="bugs" to="pig">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1"/>
<parameter name="level1" value="2"/>
<parameter name="level2" value="3"/>
<parameter name="level3" value="4"/>
<parameter name="level4" value="5"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="dir" target="floor">
<binding from="files" to="width"/>
<binding from="files" to="length"/>
Expand Down
25 changes: 23 additions & 2 deletions examples/mapping/sonarqube_split_mapping_example_1_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
<mapping version="1.0">
<linking>
<source name="prj" from="" />
<target name="ground" to="" />
<source name="prj" from="directories" />
<target name="ground" to="biome-id" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</linking>
<linking>
<source name="dir" from="complexity" />
Expand All @@ -10,6 +18,19 @@
<conversion type="normalize" />
</conversions>
</linking>
<linking>
<source name="dir" from="bugs" />
<target name="garden" to="pig" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1" />
<parameter name="level1" value="2" />
<parameter name="level2" value="3" />
<parameter name="level3" value="4" />
<parameter name="level4" value="5" />
</conversion>
</conversions>
</linking>
<linking>
<source name="fil" from="violations" />
<target name="floor" to="external_character" />
Expand Down
22 changes: 22 additions & 0 deletions examples/mapping/sonarqube_split_mapping_example_2_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
<mapping version="2.0">
<linking source="prj" target="ground"/>
<binding from="directories" to="biome-id">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="dir" target="garden">
<binding from="complexity" to="flower-ratio">
<conversions>
<conversion type="normalize"/>
</conversions>
</binding>
<binding from="bugs" to="pig" default="1">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1"/>
<parameter name="level1" value="2"/>
<parameter name="level2" value="3"/>
<parameter name="level3" value="4"/>
<parameter name="level4" value="5"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="fil" target="floor">
<binding from="functions" to="height"/>
Expand Down
25 changes: 23 additions & 2 deletions examples/mapping/sourcemeter_mapping_example_1_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@
<constant name="cellar_external_character" value="wood"/>
</resources>
<linking>
<source name="Package" from="" />
<target name="ground" to="" />
<source name="Package" from="NPKG" />
<target name="ground" to="biome-id" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</linking>
<linking>
<source name="Method" from="McCC" />
Expand Down Expand Up @@ -60,6 +68,19 @@
<conversions>
<conversion type="normalize" />
</conversions>
</linking>
<linking>
<source name="Class" from="bugs" />
<target name="garden" to="pig" />
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1" />
<parameter name="level1" value="2" />
<parameter name="level2" value="3" />
<parameter name="level3" value="4" />
<parameter name="level4" value="5" />
</conversion>
</conversions>
</linking>
<linking>
<source name="Constant" from="cellar_character"/>
Expand Down
24 changes: 23 additions & 1 deletion examples/mapping/sourcemeter_mapping_example_2_0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,35 @@
<constant id="cellar_character" value="planks"/>
<constant id="cellar_external_character" value="wood"/>
</resources>
<linking source="package" target="ground"/>
<linking source="package" target="ground">
<binding from="NPKG" to="biome-id">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="12"/>
<parameter name="level1" value="5"/>
<parameter name="level2" value="1"/>
<parameter name="level3" value="2"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="class" target="garden">
<binding from="CBO" to="flower-ratio">
<conversions>
<conversion type="normalize"/>
</conversions>
</binding>
<binding from="WarningBlocker" to="pig">
<conversions>
<conversion type="quantization">
<parameter name="level0" value="1"/>
<parameter name="level1" value="2"/>
<parameter name="level2" value="3"/>
<parameter name="level3" value="4"/>
<parameter name="level4" value="5"/>
</conversion>
</conversions>
</binding>
</linking>
<linking source="method" target="floor">
<binding from="LLOC" to="height"/>
Expand Down
22 changes: 19 additions & 3 deletions sources/codemetropolis-toolchain-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,33 @@
<dependency>
<groupId>codemetropolis.toolchain</groupId>
<artifactId>codemetropolis-toolchain-commons</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>2.32</version>
</dependency>
<dependency>
<groupId>sed</groupId>
<artifactId>graphlib</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>2.32</version>
</dependency>
<dependency>
<groupId>sed</groupId>
<artifactId>graphlib</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>codemetropolis.toolchain</groupId>
<artifactId>codemetropolis-toolchain-commons</artifactId>
<version>1.4.0</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
4 changes: 2 additions & 2 deletions sources/codemetropolis-toolchain-mapping/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
Expand Down
4 changes: 2 additions & 2 deletions ...polis-toolchain-mapping/src/main/java/codemetropolis/toolchain/mapping/model/Linking.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public class Linking {
static {
SUPPORTED_TARGETS.put(Type.FLOOR, new String[]{"width", "height", "length", "character", "external_character", "torches"});
SUPPORTED_TARGETS.put(Type.CELLAR, new String[]{"width", "height", "length", "character", "external_character", "torches"});
SUPPORTED_TARGETS.put(Type.GARDEN, new String[]{"tree-ratio", "mushroom-ratio", "flower-ratio"});
SUPPORTED_TARGETS.put(Type.GROUND, new String[]{});
SUPPORTED_TARGETS.put(Type.GARDEN, new String[]{"tree-ratio", "mushroom-ratio", "flower-ratio", "pig" , "cow", "rabbit", "chicken", "sheep"});
SUPPORTED_TARGETS.put(Type.GROUND, new String[]{"biome-id"});
}

@XmlAttribute
Expand Down
5 changes: 0 additions & 5 deletions sources/codemetropolis-toolchain-rendering/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
<groupId>sed</groupId>
<artifactId>graphlib</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>codemetropolis</groupId>
<artifactId>cmblockmodifier</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...olchain-rendering/src/main/java/codemetropolis/toolchain/rendering/RenderingExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public boolean execute(ExecutorArgs args) {
return false;
}

WorldBuilder worldBuilder = new WorldBuilder(renderingArgs.getWorldPath());
WorldBuilder worldBuilder = new WorldBuilder(renderingArgs.getWorldPath(), renderingArgs.getInputFile());
for(EventListener listener : listeners) {
worldBuilder.addEventListener((ProgressEventListener) listener);
}
Expand Down
Loading