diff --git a/BUILD.md b/BUILD.md index 6e73a06..6b860fe 100644 --- a/BUILD.md +++ b/BUILD.md @@ -16,11 +16,12 @@ within same directory as this BUILD.md : ant dist ``` - Then create de .zip ``` source ./specificdoit.sh; create_zip_package ``` -you ccan then provide and copy laby.zip to install it. \ No newline at end of file +you can then provide and copy laby.zip to install it. + +See README to find documentation how to install and run it. \ No newline at end of file diff --git a/README b/README index 16975a9..6781a74 100644 --- a/README +++ b/README @@ -19,7 +19,6 @@ ex ubuntu : sudo apt-get install default-jdk ant See BUILD.md - ===== INSTALL ===== obtain laby.zip directly build or from you own build ( see BUILD above ). diff --git a/copytominetest.sh b/copytominetest.sh new file mode 100755 index 0000000..b7cfadf --- /dev/null +++ b/copytominetest.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +name=$1.we +srcdir=lab/ +game=nm +dest=~/.minetest/worlds/$game/schems + +if [[ ! -d $dest ]] +then + echo "[ERROR] no destination directory $dest found" >&2 +fi + +src=$srcdir/$name + +if [[ -f $src ]] +then + cp $src $dest/ +else + echo "[ERROR] missing $src" >&2 +fi diff --git a/devenv_params b/devenv_params index d9caa83..cc079a5 100644 --- a/devenv_params +++ b/devenv_params @@ -1,3 +1,3 @@ -DEV_ENV=~/artisanlogiciel/devel_tools -JDK_PATH=~/artisanlogiciel/devel_tools/jdk1.8.0_74 -ECLIPSE_PATH=~/artisanlogiciel/devel_tools/eclipse +DEV_ENV=~/home/plhardy/clients/artlog/code/laby/devel_tools +JDK_PATH=/usr/lib/jvm/java-11-openjdk-amd64 +ECLIPSE_PATH=/snap/bin diff --git a/java/.classpath b/java/.classpath index 1ad8a13..9d73d07 100644 --- a/java/.classpath +++ b/java/.classpath @@ -1,7 +1,14 @@ - + + + + + + + + diff --git a/java/.gitignore b/java/.gitignore new file mode 100644 index 0000000..36582c6 --- /dev/null +++ b/java/.gitignore @@ -0,0 +1 @@ +/module-info.class diff --git a/java/org/artisanlogiciel/aaa/authorize/.gitignore b/java/org/artisanlogiciel/aaa/authorize/.gitignore new file mode 100644 index 0000000..52cf20c --- /dev/null +++ b/java/org/artisanlogiciel/aaa/authorize/.gitignore @@ -0,0 +1 @@ +/JWToken.class diff --git a/java/org/artisanlogiciel/aaa/authorize/JWToken.java b/java/org/artisanlogiciel/aaa/authorize/JWToken.java new file mode 100644 index 0000000..ebabe6e --- /dev/null +++ b/java/org/artisanlogiciel/aaa/authorize/JWToken.java @@ -0,0 +1,4 @@ +package org.artisanlogiciel.aaa.authorize; + +public class JWToken { +} diff --git a/java/org/artisanlogiciel/games/maze/.gitignore b/java/org/artisanlogiciel/games/maze/.gitignore new file mode 100644 index 0000000..f117c73 --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/.gitignore @@ -0,0 +1,20 @@ +/Brick.class +/BrickTextMapping.class +/DrawingGenerator.class +/LabyLayers.class +/LabyMap.class +/LabyModel.class +/Main.class +/Maze$1.class +/Maze$2.class +/Maze$3.class +/Maze.class +/MazeCreationListener.class +/MazeParamEditor.class +/MazeParams.class +/MazeParamsFixed.class +/MovesProvider.class +/Position.class +/PositionWithDepth.class +/WallsProvider.class +/XYGridIterator.class diff --git a/java/org/artisanlogiciel/games/maze/gui/.gitignore b/java/org/artisanlogiciel/games/maze/gui/.gitignore new file mode 100644 index 0000000..837003d --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/gui/.gitignore @@ -0,0 +1,44 @@ +/CellGridComponent.class +/Display$1.class +/Display$2.class +/Display$3.class +/Display$MazeFrame.class +/Display.class +/HexagonCellRenderer$UV.class +/HexagonCellRenderer.class +/Maze3dSettings.class +/MazeCellRenderer.class +/MazeColorMap.class +/MazeComponent.class +/MazeControler$1.class +/MazeControler$10.class +/MazeControler$11.class +/MazeControler$12.class +/MazeControler$13.class +/MazeControler$14.class +/MazeControler$15.class +/MazeControler$16.class +/MazeControler$17.class +/MazeControler$18.class +/MazeControler$19.class +/MazeControler$2.class +/MazeControler$20.class +/MazeControler$21.class +/MazeControler$22.class +/MazeControler$23.class +/MazeControler$24.class +/MazeControler$25.class +/MazeControler$26.class +/MazeControler$27.class +/MazeControler$3.class +/MazeControler$4.class +/MazeControler$5.class +/MazeControler$6.class +/MazeControler$7.class +/MazeControler$8.class +/MazeControler$9.class +/MazeControler.class +/MazeDefault.class +/MazeSettings$1.class +/MazeSettings.class +/StatusListener.class diff --git a/java/org/artisanlogiciel/games/maze/gui/Maze3dSettings.java b/java/org/artisanlogiciel/games/maze/gui/Maze3dSettings.java index 8396aac..b17b85a 100644 --- a/java/org/artisanlogiciel/games/maze/gui/Maze3dSettings.java +++ b/java/org/artisanlogiciel/games/maze/gui/Maze3dSettings.java @@ -31,13 +31,13 @@ public class Maze3dSettings void createSettingsGui() { if (params != null) { - IntegerField xl = new IntegerField("width",params.getXl()); + xl = new IntegerField("width",params.getXl()); addField(xl); - IntegerField zl = new IntegerField("height",params.getZl()); + zl = new IntegerField("height",params.getZl()); addField(zl); - IntegerField yl = new IntegerField("depth",params.getYl()); + yl = new IntegerField("depth",params.getYl()); addField(yl); reverse = new JCheckBox("reverse",params.isReverse()); @@ -52,6 +52,9 @@ public class Maze3dSettings hg = new IntegerField(params.getHg()); addField(hg); } + else { + System.err.println("params null"); + } } Maze3dParams createParams() diff --git a/java/org/artisanlogiciel/games/maze/gui/component/.gitignore b/java/org/artisanlogiciel/games/maze/gui/component/.gitignore new file mode 100644 index 0000000..2a5307c --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/gui/component/.gitignore @@ -0,0 +1,2 @@ +/IntegerField.class +/Panel.class diff --git a/java/org/artisanlogiciel/games/maze/model/.gitignore b/java/org/artisanlogiciel/games/maze/model/.gitignore new file mode 100644 index 0000000..8ed2337 --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/model/.gitignore @@ -0,0 +1,9 @@ +/BooleanLongSet.class +/HalfSquareModelCreator$SetXY.class +/HalfSquareModelCreator.class +/HalfSquareProvider.class +/HalfSquareRasterModel.class +/HexagonModelProvider.class +/LabyModelProvider.class +/LineColumnModel.class +/WidthHeightProvider.class diff --git a/java/org/artisanlogiciel/games/maze/model/HalfSquareRasterModel.java b/java/org/artisanlogiciel/games/maze/model/HalfSquareRasterModel.java index d9c241b..b032b4c 100644 --- a/java/org/artisanlogiciel/games/maze/model/HalfSquareRasterModel.java +++ b/java/org/artisanlogiciel/games/maze/model/HalfSquareRasterModel.java @@ -6,7 +6,7 @@ import org.artisanlogiciel.games.maze.WallsProvider; /** * minimal model without repetition - * keep only left and down wall and rely on neightbor squeres to obtain right and up + * keep only left and down wall and rely on neightbor squares to obtain right and up * left down compatible with Bricks * * LEFT 01 diff --git a/java/org/artisanlogiciel/games/maze/persist/.gitignore b/java/org/artisanlogiciel/games/maze/persist/.gitignore new file mode 100644 index 0000000..52430a8 --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/persist/.gitignore @@ -0,0 +1,3 @@ +/HalfSquareRasterModelPersistRaw.class +/MazePersistRaw.class +/MazePersistWorldEdit.class diff --git a/java/org/artisanlogiciel/games/maze/solve/.gitignore b/java/org/artisanlogiciel/games/maze/solve/.gitignore new file mode 100644 index 0000000..7d245dd --- /dev/null +++ b/java/org/artisanlogiciel/games/maze/solve/.gitignore @@ -0,0 +1,3 @@ +/DirectionPosition.class +/MazeResolutionListener.class +/SolvingModel.class diff --git a/java/org/artisanlogiciel/games/minetest/.gitignore b/java/org/artisanlogiciel/games/minetest/.gitignore new file mode 100644 index 0000000..a327a1f --- /dev/null +++ b/java/org/artisanlogiciel/games/minetest/.gitignore @@ -0,0 +1,8 @@ +/Material.class +/Node.class +/Range.class +/Raw.class +/Slice.class +/WorlEditGenerator.class +/World.class +/WorldEditReader.class diff --git a/java/org/artisanlogiciel/games/stl/.gitignore b/java/org/artisanlogiciel/games/stl/.gitignore new file mode 100644 index 0000000..f8d84e0 --- /dev/null +++ b/java/org/artisanlogiciel/games/stl/.gitignore @@ -0,0 +1,3 @@ +/Maze3dParams.class +/Wall3d.class +/Wall3dStream.class diff --git a/java/org/artisanlogiciel/lua/.gitignore b/java/org/artisanlogiciel/lua/.gitignore new file mode 100644 index 0000000..3fa1d64 --- /dev/null +++ b/java/org/artisanlogiciel/lua/.gitignore @@ -0,0 +1,7 @@ +/CharProvider.class +/LuaNumber.class +/LuaObject.class +/LuaSequence.class +/LuaString.class +/LuaTuple.class +/Parser.class diff --git a/java/org/artisanlogiciel/lua/Parser.java b/java/org/artisanlogiciel/lua/Parser.java index ca38968..3a7b75d 100644 --- a/java/org/artisanlogiciel/lua/Parser.java +++ b/java/org/artisanlogiciel/lua/Parser.java @@ -62,7 +62,7 @@ public class Parser { pushBackChar(c); if ( errors == null) { - errors = new ArrayList(); + errors = new ArrayList(); } System.err.println(info); errors.add(info); diff --git a/java/org/artisanlogiciel/osm/.gitignore b/java/org/artisanlogiciel/osm/.gitignore new file mode 100644 index 0000000..a71e545 --- /dev/null +++ b/java/org/artisanlogiciel/osm/.gitignore @@ -0,0 +1,4 @@ +/Node.class +/NodeRef.class +/OsmReader.class +/Way.class diff --git a/java/org/artisanlogiciel/osm/convert/.gitignore b/java/org/artisanlogiciel/osm/convert/.gitignore new file mode 100644 index 0000000..e744df3 --- /dev/null +++ b/java/org/artisanlogiciel/osm/convert/.gitignore @@ -0,0 +1 @@ +/OsmToDrawing.class diff --git a/java/org/artisanlogiciel/util/.gitignore b/java/org/artisanlogiciel/util/.gitignore new file mode 100644 index 0000000..bd5670f --- /dev/null +++ b/java/org/artisanlogiciel/util/.gitignore @@ -0,0 +1 @@ +/UTF8Control.class diff --git a/java/org/artisanlogiciel/xpm/.gitignore b/java/org/artisanlogiciel/xpm/.gitignore new file mode 100644 index 0000000..cafa5fd --- /dev/null +++ b/java/org/artisanlogiciel/xpm/.gitignore @@ -0,0 +1 @@ +/Xpm.class diff --git a/java/out/production/laby/.classpath b/java/out/production/laby/.classpath new file mode 100644 index 0000000..1ad8a13 --- /dev/null +++ b/java/out/production/laby/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/java/out/production/laby/.project b/java/out/production/laby/.project new file mode 100644 index 0000000..35da0f6 --- /dev/null +++ b/java/out/production/laby/.project @@ -0,0 +1,23 @@ + + + Karmazoff + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + + diff --git a/java/out/production/laby/LabelsBundle.properties b/java/out/production/laby/LabelsBundle.properties new file mode 100644 index 0000000..eba5ace --- /dev/null +++ b/java/out/production/laby/LabelsBundle.properties @@ -0,0 +1,15 @@ +width = Width +height = Height +depth = Depth +north = North +south = South +east = East +west = West +resolve = Resolve +create = Create +save = Save +quit = Quit +title = A Maz ing +seed = seed +load = Load +reverse = Reverse \ No newline at end of file diff --git a/java/out/production/laby/LabelsBundle_fr.properties b/java/out/production/laby/LabelsBundle_fr.properties new file mode 100644 index 0000000..e1a44f0 --- /dev/null +++ b/java/out/production/laby/LabelsBundle_fr.properties @@ -0,0 +1,15 @@ +width = Largeur +height = Hauteur +depth = Profondeur +north = Nord +south = Sud +east = Est +west = Ouest +resolve = Résoudre +create = Créer +save = Sauver +quit = Quitter +title = La Bireinte +seed = graine +load = Charger +reverse = Inverse \ No newline at end of file diff --git a/java/out/production/laby/Makefile b/java/out/production/laby/Makefile new file mode 100644 index 0000000..1b58e23 --- /dev/null +++ b/java/out/production/laby/Makefile @@ -0,0 +1,59 @@ +PACKAGE=org.artisanlogiciel.games +PACKAGE_DIR=$(subst .,/,$(PACKAGE)) +# maps with ant build.xml +OUT=../build +# external libraries +LIBS=../libs/artgaphics-0.1.0.jar +EDITOR=emacs + +$(OUT): + echo "[ERROR] Missing $(OUT)" +# mkdir -p $(OUT) + +clean: + @find $(PACKAGE_DIR) -name "*.class" -type f -print0|xargs -0 --no-run-if-empty rm 2>/dev/null + @find $(OUT) -name "*.class" -type f -print0|xargs -0 --no-run-if-empty rm 2>/dev/null + +test: + echo "$(pwd)/$(PACKAGE_DIR)" + javac -sourcepath . -cp $(LIBS) -d $(OUT) $(PACKAGE_DIR)/LabyModel.java + javac -sourcepath . -cp $(LIBS) -d $(OUT) $(PACKAGE_DIR)/Main.java + java -cp $(OUT):$(LIBS):../lang $(PACKAGE).Main + + +run/%: $(OUT) + javac -cp $(LIBS):$(OUT) -d $(OUT) $(PACKAGE_DIR)/$(subst run/,,$@).java + java -cp $(OUT):$(LIBS) $(PACKAGE)/$(subst run/,,$@) + +display: run/Display + + +display/%: $(OUT) + javac -cp $(LIBS) -d $(OUT) $(PACKAGE_DIR)/Display.java + java -cp $(OUT):$(LIBS) $(PACKAGE).Display $(subst display/,,$@) + +compile/%: + javac -d $(OUT) $(PACKAGE_DIR)/$(subst compile/,,$@).java + +$(PACKAGE_DIR)/%.java: + ./generate_new.sh class $(subst .java,,$(subst $(PACKAGE_DIR)/,,$@)) + +interface/%: + ./generate_new.sh interface package_dir=$(PACKAGE_DIR) $(subst interface/,,$@) + $(EDITOR) $(PACKAGE_DIR)/$(subst interface/,,$@).java + +work/%: $(PACKAGE_DIR)/$(subst work/,,%).java + $(EDITOR) $< + +work: work/LabyModel + +save: + git citool + +.PHONY: clean test work display work/% run/% save compile/% interface/% + +# tried to avoid intermediate file removal : does not work +# .SECONDARY: $(PACKAGE_DIR)/%.java + +# this does work : once precious intermediate file is not removed. +.PRECIOUS: $(PACKAGE_DIR)/%.java diff --git a/java/out/production/laby/README b/java/out/production/laby/README new file mode 100644 index 0000000..5f8e6bb --- /dev/null +++ b/java/out/production/laby/README @@ -0,0 +1,24 @@ +A Maze generator that keep all reverse paths to solutions. + +See Makefile + +#clean +make clean + +#console +make test + +#gui +make display + +#code emacs : work/ClassName +make work/Display + +#run a class +make run/Display + +#save work with git (ie git citool ) +make save + +# create an interface +make interface/InterfaceName \ No newline at end of file diff --git a/java/out/production/laby/TODO b/java/out/production/laby/TODO new file mode 100644 index 0000000..fc5d406 --- /dev/null +++ b/java/out/production/laby/TODO @@ -0,0 +1,16 @@ +By pref + +- rendering +GUI +* WALK it... +* regenerate it + +CONSOLE : +* provide interactive ( view a part of maze ) + +- model +* saving in stream ( better than in toString() that basically fails... ) + +- format : +3D format ( for 3Dprinting ) +