conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
public int getScanMode() {
return scanMode;
}
=======
// hack to fix eumetsat GDS
public void setCenter(int center) {
this.center = center;
}
>>>>>>>
public int getScanMode() {
return scanMode;
}
// hack to fix eumetsat GDS
public void setCenter(int center) {
this.center = center;
} |
<<<<<<<
String filename = TestLocal.temporaryDataDir + "testWrite.nc";
NetcdfFileWriter ncfile = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename);
ncfile.setFill(false);
// define dimensions
Dimension latDim = ncfile.addDimension("lat", 64);
Dimension lonDim = ncfile.addDimension("lon", 128);
// define Variables
Variable tempVar = ncfile.addVariable("temperature", DataType.DOUBLE, "lat lon");
ncfile.addVariableAttribute("temperature", "units", "K");
Array data = Array.factory(DataType.INT, new int[]{3}, new int[]{1, 2, 3});
ncfile.addVariableAttribute(tempVar, new Attribute("scale", data));
ncfile.addVariableAttribute("temperature", "versionD", 1.2);
ncfile.addVariableAttribute("temperature", "versionF", 1.2f);
ncfile.addVariableAttribute("temperature", "versionI", 1);
ncfile.addVariableAttribute("temperature", "versionS", (short) 2);
ncfile.addVariableAttribute("temperature", "versionB", (byte) 3);
ncfile.addVariableAttribute("temperature", "versionString", "1.2");
// add string-valued variables
Dimension svar_len = ncfile.addDimension("svar_len", 80);
Variable sVar = ncfile.addVariable("svar", DataType.CHAR, "svar_len");
Variable sVar2 = ncfile.addVariable("svar2", DataType.CHAR, "svar_len");
// string array
Dimension names = ncfile.addDimension("names", 3);
Variable namesVar = ncfile.addVariable("names", DataType.CHAR, "names svar_len");
Variable names2Var = ncfile.addVariable("names2", DataType.CHAR, "names svar_len");
// how about a scalar variable?
Variable scalarVar = ncfile.addVariable("scalar", DataType.DOUBLE, "");
// signed byte
Variable bVar = ncfile.addVariable("bvar", DataType.BYTE, "lat");
// add global attributes
ncfile.addGlobalAttribute("yo", "face");
ncfile.addGlobalAttribute("versionD", 1.2);
ncfile.addGlobalAttribute("versionF", 1.2f);
ncfile.addGlobalAttribute("versionI", 1);
ncfile.addGlobalAttribute("versionS", (short) 2);
ncfile.addGlobalAttribute("versionB", (byte) 3);
// test some errors
try {
Array bad = Array.makeObjectArray(DataType.OBJECT, ArrayList.class, new int[]{1}, null);
ncfile.addGroupAttribute(null, new Attribute("versionC", bad));
assert (false);
} catch (IllegalArgumentException e) {
assert (true);
}
// create the file
ncfile.create();
=======
String filename = tempFolder.newFile("testWrite.nc").getAbsolutePath();
try (NetcdfFileWriteable ncfile = NetcdfFileWriteable.createNew(filename, false)) {
// define dimensions
Dimension latDim = ncfile.addDimension("lat", 64);
Dimension lonDim = ncfile.addDimension("lon", 128);
// define Variables
ArrayList dims = new ArrayList();
dims.add(latDim);
dims.add(lonDim);
ncfile.addVariable("temperature", DataType.DOUBLE, dims);
ncfile.addVariableAttribute("temperature", "units", "K");
Array data = Array.factory(int.class, new int[] { 3 }, new int[] { 1, 2, 3 });
ncfile.addVariableAttribute("temperature", "scale", data);
ncfile.addVariableAttribute("temperature", "versionD", new Double(1.2));
ncfile.addVariableAttribute("temperature", "versionF", new Float(1.2));
ncfile.addVariableAttribute("temperature", "versionI", new Integer(1));
ncfile.addVariableAttribute("temperature", "versionS", new Short((short) 2));
ncfile.addVariableAttribute("temperature", "versionB", new Byte((byte) 3));
ncfile.addVariableAttribute("temperature", "versionString", "1.2");
// add string-valued variables
Dimension svar_len = ncfile.addDimension("svar_len", 80);
dims = new ArrayList();
dims.add(svar_len);
ncfile.addVariable("svar", DataType.CHAR, dims);
ncfile.addVariable("svar2", DataType.CHAR, dims);
// string array
Dimension names = ncfile.addDimension("names", 3);
ArrayList dima = new ArrayList();
dima.add(names);
dima.add(svar_len);
ncfile.addVariable("names", DataType.CHAR, dima);
ncfile.addVariable("names2", DataType.CHAR, dima);
// how about a scalar variable?
ncfile.addVariable("scalar", DataType.DOUBLE, new ArrayList());
// signed byte
ncfile.addVariable("bvar", DataType.BYTE, "lat");
// add global attributes
ncfile.addGlobalAttribute("yo", "face");
ncfile.addGlobalAttribute("versionD", new Double(1.2));
ncfile.addGlobalAttribute("versionF", new Float(1.2));
ncfile.addGlobalAttribute("versionI", new Integer(1));
ncfile.addGlobalAttribute("versionS", new Short((short) 2));
ncfile.addGlobalAttribute("versionB", new Byte((byte) 3));
// test some errors
try {
Array bad = Array.factory(ArrayList.class, new int[] { 1 });
ncfile.addGlobalAttribute("versionC", bad);
assert (false);
} catch (IllegalArgumentException e) {
assert (true);
}
>>>>>>>
String filename = tempFolder.newFile("testWrite.nc").getAbsolutePath();
try (NetcdfFileWriteable ncfile = NetcdfFileWriteable.createNew(filename, false)) {
// define dimensions
Dimension latDim = ncfile.addDimension("lat", 64);
Dimension lonDim = ncfile.addDimension("lon", 128);
// define Variables
Variable tempVar = ncfile.addVariable("temperature", DataType.DOUBLE, "lat lon");
ncfile.addVariableAttribute("temperature", "units", "K");
Array data = Array.factory(DataType.INT, new int[]{3}, new int[]{1, 2, 3});
ncfile.addVariableAttribute(tempVar, new Attribute("scale", data));
ncfile.addVariableAttribute("temperature", "versionD", 1.2);
ncfile.addVariableAttribute("temperature", "versionF", 1.2f);
ncfile.addVariableAttribute("temperature", "versionI", 1);
ncfile.addVariableAttribute("temperature", "versionS", (short) 2);
ncfile.addVariableAttribute("temperature", "versionB", (byte) 3);
ncfile.addVariableAttribute("temperature", "versionString", "1.2");
// add string-valued variables
Dimension svar_len = ncfile.addDimension("svar_len", 80);
Variable sVar = ncfile.addVariable("svar", DataType.CHAR, "svar_len");
Variable sVar2 = ncfile.addVariable("svar2", DataType.CHAR, "svar_len");
// string array
Dimension names = ncfile.addDimension("names", 3);
Variable namesVar = ncfile.addVariable("names", DataType.CHAR, "names svar_len");
Variable names2Var = ncfile.addVariable("names2", DataType.CHAR, "names svar_len");
// how about a scalar variable?
Variable scalarVar = ncfile.addVariable("scalar", DataType.DOUBLE, "");
// signed byte
Variable bVar = ncfile.addVariable("bvar", DataType.BYTE, "lat");
// add global attributes
ncfile.addGlobalAttribute("yo", "face");
ncfile.addGlobalAttribute("versionD", 1.2);
ncfile.addGlobalAttribute("versionF", 1.2f);
ncfile.addGlobalAttribute("versionI", 1);
ncfile.addGlobalAttribute("versionS", (short) 2);
ncfile.addGlobalAttribute("versionB", (byte) 3);
// test some errors
try {
Array bad = Array.makeObjectArray(DataType.OBJECT, ArrayList.class, new int[]{1}, null);
ncfile.addGroupAttribute(null, new Attribute("versionC", bad));
assert (false);
} catch (IllegalArgumentException e) {
assert (true);
}
// test some errors
try {
Array bad = Array.factory(ArrayList.class, new int[]{1});
ncfile.addGlobalAttribute("versionC", bad);
assert (false);
} catch (IllegalArgumentException e) {
assert (true);
}
<<<<<<<
ncWriteable.addVariable("time", DataType.INT, "time");
=======
ncWriteable.addVariable("time", DataType.INT, new Dimension[] { timeDim });
>>>>>>>
ncWriteable.addVariable("time", DataType.INT, new Dimension[] { timeDim });
<<<<<<<
timeDataAll = Array.factory(DataType.INT, new int[]{size});
IndexIterator iter = timeDataAll.getIndexIterator();
Array timeData = Array.factory(DataType.INT, new int[]{1});
int[] time_origin = new int[]{0};
=======
Array timeData = Array.factory(DataType.INT, new int[] { 1 });
int[] time_origin = new int[] { 0 };
>>>>>>>
Array timeData = Array.factory(DataType.INT, new int[] { 1 });
int[] time_origin = new int[] { 0 };
<<<<<<<
System.out.println(result2);
ucar.unidata.test.util.CompareNetcdf.compareData(timeDataAll, result2);
=======
Assert.assertEquals("0 12 24 36 48 60 72 84 96 108", result2.toString().trim());
ucar.unidata.test.util.CompareNetcdf.compareData(result1, result2);
>>>>>>>
Assert.assertEquals("0 12 24 36 48 60 72 84 96 108", result2.toString().trim());
ucar.unidata.test.util.CompareNetcdf.compareData(result1, result2); |
<<<<<<<
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
=======
>>>>>>>
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
<<<<<<<
=======
import thredds.servlet.ThreddsConfig;
import ucar.unidata.test.util.NeedsContentRoot;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
>>>>>>>
import ucar.unidata.test.util.NeedsContentRoot;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
<<<<<<<
@ContextConfiguration(locations={"/WEB-INF/applicationContext.xml"},loader=MockTdsContextLoader.class)
=======
@ContextConfiguration(locations={"/WEB-INF/applicationContext-tdsConfig.xml"},loader=MockTdsContextLoader.class)
@Category(NeedsContentRoot.class)
>>>>>>>
@ContextConfiguration(locations={"/WEB-INF/applicationContext.xml"},loader=MockTdsContextLoader.class)
@Category(NeedsContentRoot.class) |
<<<<<<<
String filename = TestLocal.temporaryDataDir + "testUnsignedAttribute2.nc";
//String filename = "C:/tmp/testUnsignedAttribute3.nc";
System.out.printf("%s%n", filename);
NetcdfFileWriter writer = null;
try {
writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename);
writer.addUnlimitedDimension("time");
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.BYTE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a, false));
=======
String filename = tempFolder.newFile("testUnsignedAttribute2.nc").getAbsolutePath();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.BYTE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a));
>>>>>>>
String filename = tempFolder.newFile("testUnsignedAttribute2.nc").getAbsolutePath();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.BYTE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a, false));
<<<<<<<
int[] shape = new int[]{1, 1, lonSize};
float[] floatStorage = new float[lonSize];
Array floatArray = Array.factory(DataType.FLOAT, shape, floatStorage);
for (int t = 0; t < timeSize; t++) {
for (int i = 0; i < latSize; i++) {
int[] origin = new int[]{t, i, 0};
fileWriter.write(v, origin, floatArray);
=======
int[] shape = new int[] { 1, 1, lonSize };
float[] floatStorage = new float[lonSize];
Array floatArray = Array.factory(float.class, shape, floatStorage);
for (int t = 0; t < timeSize; t++) {
for (int i = 0; i < latSize; i++) {
int[] origin = new int[] { t, i, 0 };
fileWriter.write(v, origin, floatArray);
}
>>>>>>>
int[] shape = new int[]{1, 1, lonSize};
float[] floatStorage = new float[lonSize];
Array floatArray = Array.factory(DataType.FLOAT, shape, floatStorage);
for (int t = 0; t < timeSize; t++) {
for (int i = 0; i < latSize; i++) {
int[] origin = new int[]{t, i, 0};
fileWriter.write(v, origin, floatArray);
<<<<<<<
String filename = TestLocal.temporaryDataDir + "testRedefine.nc";
//String filename = "C:/tmp/testUnsignedAttribute3.nc";
System.out.printf("%s%n", filename);
NetcdfFileWriter writer = null;
writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename);
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a));
writer.create();
boolean rewrite = writer.setRedefineMode(true);
assert !rewrite;
Attribute newAtt = writer.renameGroupAttribute(null, "name", "NAM");
System.out.printf("newAtt = %s%n", newAtt);
assert newAtt != null;
assert newAtt.getShortName().equals("NAM");
Attribute newAtt2 = writer.renameGroupAttribute(null, "NAM", "nameLongerThanYou");
System.out.printf("newAtt2 = %s%n", newAtt2);
assert newAtt2 != null;
assert newAtt2.getShortName().equals("nameLongerThanYou");
writer.create();
writer.close();
NetcdfFile ncfile = NetcdfFile.open(filename);
Attribute att3 = ncfile.findGlobalAttribute("nameLongerThanYou");
System.out.printf("read att = %s%n", att3);
assert att3 != null;
ncfile.close();
=======
String filename = tempFolder.newFile("testRedefine.nc").getAbsolutePath();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a));
writer.create();
boolean rewrite = writer.setRedefineMode(true);
assert !rewrite;
Attribute newAtt = writer.renameGlobalAttribute(null, "name", "NAM");
assert newAtt != null;
assert newAtt.getShortName().equals("NAM");
Attribute newAtt2 = writer.renameGlobalAttribute(null, "NAM", "nameLongerThanYou");
assert newAtt2 != null;
assert newAtt2.getShortName().equals("nameLongerThanYou");
writer.create();
}
try (NetcdfFile ncfile = NetcdfFile.open(filename)) {
Attribute att3 = ncfile.findGlobalAttribute("nameLongerThanYou");
assert att3 != null;
}
>>>>>>>
String filename = tempFolder.newFile("testRedefine.nc").getAbsolutePath();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable v = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(v, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(v, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(v, new Attribute(CDM.VALID_RANGE, a));
writer.create();
boolean rewrite = writer.setRedefineMode(true);
assert !rewrite;
Attribute newAtt = writer.renameGroupAttribute(null, "name", "NAM");
System.out.printf("newAtt = %s%n", newAtt);
assert newAtt != null;
assert newAtt.getShortName().equals("NAM");
Attribute newAtt2 = writer.renameGroupAttribute(null, "NAM", "nameLongerThanYou");
System.out.printf("newAtt2 = %s%n", newAtt2);
assert newAtt2 != null;
assert newAtt2.getShortName().equals("nameLongerThanYou");
writer.create();
}
try (NetcdfFile ncfile = NetcdfFile.open(filename)) {
Attribute att3 = ncfile.findGlobalAttribute("nameLongerThanYou");
assert att3 != null;
}
<<<<<<<
System.out.printf("%s%n", f.exists());
boolean ok = f.delete();
System.out.printf("%s%n", ok);
NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename);
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable time = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(time, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(time, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(time, new Attribute(CDM.VALID_RANGE, a));
writer.create();
Array data = Array.makeFromJavaArray(new double[]{0, 1, 2, 3});
writer.write(time, data);
writer.close();
NetcdfFileWriter writer2 = NetcdfFileWriter.openExisting(filename);
boolean rewrite2 = writer2.setRedefineMode(true);
assert !rewrite2;
writer2.addGroupAttribute(null, new Attribute("name2", "value2"));
boolean rewrite3 = writer2.setRedefineMode(false);
assert rewrite3;
Variable time2 = writer2.findVariable("time");
assert time2 != null;
data = Array.makeFromJavaArray(new double[]{4, 5, 6});
int[] origin = new int[1];
origin[0] = (int) time2.getSize();
writer2.write(time2, origin, data);
writer2.close();
NetcdfFileWriter writer3 = NetcdfFileWriter.openExisting(filename);
Variable time3 = writer3.findVariable("time");
data = Array.makeFromJavaArray(new double[]{8, 9});
origin[0] = (int) time3.getSize();
writer3.write(time3, origin, data);
writer3.close();
NetcdfFile ncfile = NetcdfFile.open(filename);
Attribute att3 = ncfile.findGlobalAttribute("name2");
System.out.printf("read att = %s%n", att3);
assert att3 != null;
Variable vv = ncfile.findVariable(null, "time") ;
assert vv.getSize() == 9 : vv.getSize();
ncfile.close();
}
=======
assert f.delete();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable time = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(time, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(time, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(time, new Attribute(CDM.VALID_RANGE, a));
writer.create();
Array data = Array.factory(new double[] { 0, 1, 2, 3 });
writer.write(time, data);
}
>>>>>>>
assert f.delete();
try (NetcdfFileWriter writer = NetcdfFileWriter.createNew(NetcdfFileWriter.Version.netcdf3, filename)) {
writer.addUnlimitedDimension("time");
writer.addGroupAttribute(null, new Attribute("name", "value"));
// public Variable addVariable(Group g, String shortName, DataType dataType, String dims) {
Variable time = writer.addVariable(null, "time", DataType.DOUBLE, "time");
writer.addVariableAttribute(time, new Attribute(CDM.UNSIGNED, "true"));
writer.addVariableAttribute(time, new Attribute(CDM.SCALE_FACTOR, 10.0));
List<Integer> a = new ArrayList<Integer>();
a.add(10);
a.add(240);
writer.addVariableAttribute(time, new Attribute(CDM.VALID_RANGE, a));
writer.create();
Array data = Array.makeFromJavaArray(new double[]{0, 1, 2, 3});
writer.write(time, data); |
<<<<<<<
import thredds.featurecollection.FeatureCollectionConfig;
=======
import com.google.protobuf.ExtensionRegistry;
>>>>>>>
import thredds.featurecollection.FeatureCollectionConfig;
import com.google.protobuf.ExtensionRegistry; |
<<<<<<<
import ucar.nc2.ft.*;
import ucar.nc2.time.CalendarDate;
import ucar.unidata.test.util.TestDir;
import ucar.unidata.test.util.NeedsExternalResource;
import java.io.IOException;
import java.util.Formatter;
=======
import ucar.nc2.ft.FeatureCollection;
import ucar.nc2.ft.FeatureDataset;
import ucar.nc2.ft.FeatureDatasetFactoryManager;
import ucar.nc2.ft.FeatureDatasetPoint;
import ucar.nc2.ft.NestedPointFeatureCollection;
import ucar.nc2.ft.PointFeatureCollection;
import ucar.nc2.ft.StationProfileFeatureCollection;
import ucar.unidata.util.test.category.NeedsExternalResource;
import ucar.unidata.util.test.TestDir;
>>>>>>>
import ucar.nc2.ft.*;
import ucar.nc2.time.CalendarDate;
import ucar.unidata.util.test.category.NeedsExternalResource;
import ucar.unidata.util.test.TestDir;
import java.io.IOException;
import java.util.Formatter; |
<<<<<<<
readStandardParams(ctv, geoCoordinateUnits);
// create spherical Earth obj if not created by readStandardParams w/ radii, flattening
=======
// create spherical Earth obj if not created by readStandardParams w radii, flattening
>>>>>>>
readStandardParams(ctv, geoCoordinateUnits);
// create spherical Earth obj if not created by readStandardParams w radii, flattening |
<<<<<<<
* Copyright 1998-2015 John Caron and University Corporation for Atmospheric Research/Unidata
*
* Portions of this software were developed by the Unidata Program at the
* University Corporation for Atmospheric Research.
*
* Access and use of this software shall impose the following obligations
* and understandings on the user. The user is granted the right, without
* any fee or cost, to use, copy, modify, alter, enhance and distribute
* this software, and any derivative works thereof, and its supporting
* documentation for any purpose whatsoever, provided that this entire
* notice appears in all copies of the software, derivative works and
* supporting documentation. Further, UCAR requests that the user credit
* UCAR/Unidata in any publications that result from the use of this
* software or in any product that includes this software. The names UCAR
* and/or Unidata, however, may not be used in any advertising or publicity
* to endorse or promote any products or commercial entity unless specific
* written permission is obtained from UCAR/Unidata. The user also
* understands that UCAR/Unidata is not obligated to provide the user with
* any support, consulting, training or assistance of any kind with regard
* to the use, operation and performance of this software nor to provide
* the user with any updates, revisions, new versions or "bug fixes."
*
* THIS SOFTWARE IS PROVIDED BY UCAR/UNIDATA "AS IS" AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL UCAR/UNIDATA BE LIABLE FOR ANY SPECIAL,
* INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
=======
* Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
>>>>>>>
* Copyright (c) 1998-2017 John Caron and University Corporation for Atmospheric Research/Unidata |
<<<<<<<
import thredds.server.ncss.controller.NcssDiskCache;
import ucar.unidata.test.util.NeedsCdmUnitTest;
=======
import thredds.servlet.DataRootHandler;
import ucar.unidata.util.test.category.NeedsCdmUnitTest;
>>>>>>>
import thredds.server.ncss.controller.NcssDiskCache;
import ucar.unidata.util.test.category.NeedsCdmUnitTest; |
<<<<<<<
import ucar.nc2.NetcdfFile;
import ucar.nc2.Variable;
import ucar.nc2.iosp.netcdf3.N3iosp;
import ucar.unidata.test.util.TestDir;
=======
import junit.framework.TestCase;
import ucar.unidata.util.test.TestDir;
>>>>>>>
import ucar.nc2.NetcdfFile;
import ucar.nc2.Variable;
import ucar.nc2.iosp.netcdf3.N3iosp;
import ucar.unidata.util.test.TestDir; |
<<<<<<<
if (series instanceof EReportingSeries) {
EReportingSeries eReportingSeries = (EReportingSeries) series;
eReportingSeries.setSamplingPoint(getEReportingSamplingPoint());
}
=======
series.setPublished(true);
>>>>>>>
series.setPublished(true);
if (series instanceof EReportingSeries) {
EReportingSeries eReportingSeries = (EReportingSeries) series;
eReportingSeries.setSamplingPoint(getEReportingSamplingPoint());
} |
<<<<<<<
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.impl.Tables;
=======
import org.apache.accumulo.core.client.TableNotFoundException;
>>>>>>>
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.impl.Tables; |
<<<<<<<
//It uses maven path for resources and default threddsConfig
//threddsConfigPath ="C:/dev/github/thredds3/tds/src/test/content/thredds/threddsConfig.xml";
threddsConfigPath= tdsContext.getContentRootPathProperty() + "/thredds/threddsConfig.xml";
=======
//threddsConfigPath ="/thredds/tds/src/test/content/thredds/threddsConfig.xml";
threddsConfigPath= tdsContext.getContentRootPath() + "/thredds/threddsConfig.xml";
>>>>>>>
//threddsConfigPath ="/thredds/tds/src/test/content/thredds/threddsConfig.xml";
threddsConfigPath= tdsContext.getContentRootPathProperty() + "/thredds/threddsConfig.xml";
<<<<<<<
assertFalse(ThreddsConfig.hasElement("AggregationCache") );
=======
assertFalse(ThreddsConfig.hasElement("CORS") );
}
// Tests the "cachePathPolicy" element, added in response to this message on the thredds mailing list:
// http://www.unidata.ucar.edu/mailing_lists/archives/thredds/2016/msg00001.html
@Test
public void testCachePathPolicy() {
String policyStr = ThreddsConfig.get("AggregationCache.cachePathPolicy", null);
assertEquals("OneDirectory", policyStr);
DiskCache2.CachePathPolicy policyObj = DiskCache2.CachePathPolicy.valueOf(policyStr);
assertSame(DiskCache2.CachePathPolicy.OneDirectory, policyObj);
>>>>>>>
assertFalse(ThreddsConfig.hasElement("CORS") );
}
// Tests the "cachePathPolicy" element, added in response to this message on the thredds mailing list:
// http://www.unidata.ucar.edu/mailing_lists/archives/thredds/2016/msg00001.html
@Test
public void testCachePathPolicy() {
String policyStr = ThreddsConfig.get("AggregationCache.cachePathPolicy", null);
assertEquals("OneDirectory", policyStr);
DiskCache2.CachePathPolicy policyObj = DiskCache2.CachePathPolicy.valueOf(policyStr);
assertSame(DiskCache2.CachePathPolicy.OneDirectory, policyObj); |
<<<<<<<
import thredds.server.config.TdsServerInfoBean;
import ucar.unidata.test.util.NeedsContentRoot;
=======
import thredds.server.config.TdsServerInfo;
import ucar.unidata.util.test.category.NeedsContentRoot;
>>>>>>>
import thredds.server.config.TdsServerInfoBean;
import ucar.unidata.util.test.category.NeedsContentRoot; |
<<<<<<<
int NC_MAX_DIMS = 1024; /* max dimensions per file */
int NC_MAX_ATTRS = 8192; /* max global or per variable attributes */
int NC_MAX_VARS = 8192; /* max variables per file */
int NC_MAX_NAME = 256; /* max length of a name */
int NC_MAX_VAR_DIMS = NC_MAX_DIMS; /* max per variable dimensions */
int NC_GLOBAL = -1;
int NC_UNLIMITED = 0;
int NC_NOWRITE = 0;
int NC_WRITE = 1;
int NC_BYTE = 1; /* signed 1 byte integer */
int NC_CHAR = 2; /* ISO/ASCII character */
int NC_SHORT = 3; /* signed 2 byte integer */
int NC_INT = 4; /* signed 4 byte integer */
int NC_FLOAT = 5; /* single precision floating point number */
int NC_DOUBLE = 6; /* double precision floating point number */
int NC_UBYTE = 7; /* unsigned 1 byte int */
int NC_USHORT = 8; /* unsigned 2-byte int */
int NC_UINT = 9; /* unsigned 4-byte int */
int NC_INT64 = 10; /* signed 8-byte int */
int NC_UINT64 = 11;/* unsigned 8-byte int */
int NC_STRING = 12; /* string */
int NC_MAX_ATOMIC_TYPE = NC_STRING;
=======
static public final int NC_MAX_DIMS = 1024; /* max dimensions per file */
static public final int NC_MAX_ATTRS = 8192; /* max global or per variable attributes */
static public final int NC_MAX_VARS = 8192; /* max variables per file */
static public final int NC_MAX_NAME = 256; /* max length of a name */
static public final int NC_MAX_VAR_DIMS = NC_MAX_DIMS; /* max per variable dimensions */
static public final int NC_GLOBAL = -1;
static public final int NC_UNLIMITED = 0;
static public final int NC_NOWRITE = 0;
static public final int NC_WRITE = 1;
static public final int NC_NAT = 0; /* Not-A-Type */
static public final int NC_BYTE = 1; /* signed 1 byte integer */
static public final int NC_CHAR = 2; /* ISO/ASCII character */
static public final int NC_SHORT = 3; /* signed 2 byte integer */
static public final int NC_INT = 4; /* signed 4 byte integer */
static public final int NC_FLOAT = 5; /* single precision floating point number */
static public final int NC_DOUBLE = 6; /* double precision floating point number */
static public final int NC_UBYTE = 7; /* unsigned 1 byte int */
static public final int NC_USHORT = 8; /* unsigned 2-byte int */
static public final int NC_UINT = 9; /* unsigned 4-byte int */
static public final int NC_INT64 = 10; /* signed 8-byte int */
static public final int NC_UINT64 = 11;/* unsigned 8-byte int */
static public final int NC_STRING = 12; /* string */
static public final int NC_MAX_ATOMIC_TYPE = NC_STRING;
>>>>>>>
int NC_MAX_DIMS = 1024; /* max dimensions per file */
int NC_MAX_ATTRS = 8192; /* max global or per variable attributes */
int NC_MAX_VARS = 8192; /* max variables per file */
int NC_MAX_NAME = 256; /* max length of a name */
int NC_MAX_VAR_DIMS = NC_MAX_DIMS; /* max per variable dimensions */
int NC_GLOBAL = -1;
int NC_UNLIMITED = 0;
int NC_NOWRITE = 0;
int NC_WRITE = 1;
int NC_NAT = 0; /* Not-A-Type */
int NC_BYTE = 1; /* signed 1 byte integer */
int NC_CHAR = 2; /* ISO/ASCII character */
int NC_SHORT = 3; /* signed 2 byte integer */
int NC_INT = 4; /* signed 4 byte integer */
int NC_FLOAT = 5; /* single precision floating point number */
int NC_DOUBLE = 6; /* double precision floating point number */
int NC_UBYTE = 7; /* unsigned 1 byte int */
int NC_USHORT = 8; /* unsigned 2-byte int */
int NC_UINT = 9; /* unsigned 4-byte int */
int NC_INT64 = 10; /* signed 8-byte int */
int NC_UINT64 = 11;/* unsigned 8-byte int */
int NC_STRING = 12; /* string */
int NC_MAX_ATOMIC_TYPE = NC_STRING; |
<<<<<<<
import ucar.nc2.util.CommonTestUtils;
import ucar.unidata.test.util.NeedsExternalResource;
import ucar.unidata.test.util.TestDir;
=======
import ucar.nc2.util.Misc;
import ucar.unidata.util.test.UnitTestCommon;
import ucar.unidata.util.test.category.NeedsExternalResource;
import ucar.unidata.util.test.TestDir;
>>>>>>>
import ucar.unidata.util.test.UnitTestCommon;
import ucar.unidata.util.test.category.NeedsExternalResource;
import ucar.unidata.util.test.TestDir; |
<<<<<<<
ucar.unidata.test.util.CompareNetcdf.compareFiles(ncd, ncWrap);
ncd.close();
ncWrap.close();
}
=======
ucar.unidata.util.test.CompareNetcdf.compareFiles(ncd, ncWrap);
ncd.close();
ncWrap.close();
>>>>>>>
ucar.unidata.util.test.CompareNetcdf.compareFiles(ncd, ncWrap);
ncd.close();
ncWrap.close();
} |
<<<<<<<
Log.i(TAG, "sizeGridToDisplay width: " + width + ", height: " + height + ", numCols: " + numColumns);
if (g != null) {
g.setNumColumns(numColumns);
g.setColumnWidth(columnWidth);
}
=======
if (DEBUG) Log.i(TAG, "sizeGridToDisplay width: " + width + ", height: " + height + ", numCols: " + numColumns);
g.setNumColumns(numColumns);
g.setColumnWidth(columnWidth);
>>>>>>>
if (DEBUG) Log.i(TAG, "sizeGridToDisplay width: " + width + ", height: " + height + ", numCols: " + numColumns);
if (g != null) {
g.setNumColumns(numColumns);
g.setColumnWidth(columnWidth);
} |
<<<<<<<
setContentView(R.layout.photo_grid);
}
@Override
protected void onStart() {
super.onStart();
prefs = getSharedPreferences(ChanHelper.PREF_NAME, 0);
selectedBoardType = ChanBoard.Type.valueOf(prefs.getString(ChanHelper.BOARD_TYPE, ChanBoard.Type.JAPANESE_CULTURE.toString()));
Log.i(TAG, "onStart selectedBoardType: " + selectedBoardType);
=======
reloadBoardPrefs();
>>>>>>>
setContentView(R.layout.photo_grid);
}
@Override
protected void onStart() {
super.onStart();
prefs = getSharedPreferences(ChanHelper.PREF_NAME, 0);
selectedBoardType = ChanBoard.Type.valueOf(prefs.getString(ChanHelper.BOARD_TYPE, ChanBoard.Type.JAPANESE_CULTURE.toString()));
Log.i(TAG, "onStart selectedBoardType: " + selectedBoardType);
<<<<<<<
Log.i(TAG, "onStart width: " + width + ", height: " + height);
=======
Log.i(TAG, "width: " + width + ", height: " + height);
>>>>>>>
Log.i(TAG, "onStart width: " + width + ", height: " + height);
<<<<<<<
=======
setContentView(R.layout.photo_grid);
>>>>>>>
setContentView(R.layout.photo_grid);
<<<<<<<
tabHost.setOnTabChangedListener(this);
=======
}
@Override
protected void onResume() {
super.onResume();
reloadBoardPrefs();
>>>>>>>
tabHost.setOnTabChangedListener(this);
}
@Override
protected void onResume() {
super.onResume();
Log.i(TAG, "onResume");
reloadBoardPrefs();
<<<<<<<
@Override
protected void onRestart() {
super.onRestart();
Log.i(TAG, "onRestart");
}
protected void onResume () {
super.onResume();
Log.i(TAG, "onResume");
}
public void onWindowFocusChanged (boolean hasFocus) {
Log.i(TAG, "onWindowFocusChanged hasFocus: " + hasFocus);
}
=======
private void reloadBoardPrefs() {
prefs = getSharedPreferences(ChanHelper.PREF_NAME, 0);
selectedBoardType = ChanBoard.Type.valueOf(prefs.getString(ChanHelper.BOARD_TYPE, ChanBoard.Type.JAPANESE_CULTURE.toString()));
}
@Override
protected void onPause() {
super.onPause();
>>>>>>>
@Override
protected void onRestart() {
super.onRestart();
Log.i(TAG, "onRestart");
}
public void onWindowFocusChanged (boolean hasFocus) {
Log.i(TAG, "onWindowFocusChanged hasFocus: " + hasFocus);
}
private void reloadBoardPrefs() {
prefs = getSharedPreferences(ChanHelper.PREF_NAME, 0);
selectedBoardType = ChanBoard.Type.valueOf(prefs.getString(ChanHelper.BOARD_TYPE, ChanBoard.Type.JAPANESE_CULTURE.toString()));
}
@Override |
<<<<<<<
getThreadText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h, 0});
=======
getThreadText(thread), getPostText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h});
>>>>>>>
getThreadText(thread), getPostText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h, 0});
<<<<<<<
getThreadText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h, 0});
=======
getThreadText(thread), getPostText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h});
>>>>>>>
getThreadText(thread), getPostText(thread), thread.tn_w, thread.tn_h, thread.w, thread.h, 0});
<<<<<<<
getPostText(post), post.tn_w, post.tn_h, post.w, post.h, 0});
=======
getThreadText(post), getPostText(post), post.tn_w, post.tn_h, post.w, post.h});
>>>>>>>
getThreadText(post), getPostText(post), post.tn_w, post.tn_h, post.w, post.h, 0});
<<<<<<<
getPostText(post), post.tn_w, post.tn_h, post.w, post.h, 0});
=======
getThreadText(post), getPostText(post), post.tn_w, post.tn_h, post.w, post.h});
>>>>>>>
getThreadText(post), getPostText(post), post.tn_w, post.tn_h, post.w, post.h, 0}); |
<<<<<<<
Log.w(TAG, "Loading " + chanApi + " in " + (Calendar.getInstance().getTimeInMillis() - startTime) + "ms");
startTime = Calendar.getInstance().getTimeInMillis();
if (pageNo == 0) {
Log.i(TAG, "page 0 request, therefore resetting board.lastPage to false");
board.lastPage = false;
=======
if (board == null) {
Log.e(TAG, "Couldn't load board, creation failed, thus exiting service for boardCode=" + boardCode);
>>>>>>>
Log.w(TAG, "Loading " + chanApi + " in " + (Calendar.getInstance().getTimeInMillis() - startTime) + "ms");
startTime = Calendar.getInstance().getTimeInMillis();
if (pageNo == 0) {
Log.i(TAG, "page 0 request, therefore resetting board.lastPage to false");
board.lastPage = false;
<<<<<<<
=======
long now = (new Date()).getTime();
if (pageNo == 0) {
Log.i(TAG, "page 0 request, therefore resetting board.lastPage to false");
board.lastPage = false;
long interval = now - board.lastFetched;
if (force && interval < MIN_BOARD_FORCE_INTERVAL) {
Log.i(TAG, "board is forced but interval=" + interval + " is less than min=" + MIN_BOARD_FORCE_INTERVAL + " so exiting");
return;
}
if (!force && interval < MIN_BOARD_FETCH_INTERVAL) {
Log.i(TAG, "board interval=" + interval + " less than min=" + MIN_BOARD_FETCH_INTERVAL + " and not force thus exiting service");
return;
}
}
URL chanApi = new URL("http://api.4chan.org/" + boardCode + "/" + pageNo + ".json");
>>>>>>>
long now = (new Date()).getTime();
if (pageNo == 0) {
Log.i(TAG, "page 0 request, therefore resetting board.lastPage to false");
board.lastPage = false;
long interval = now - board.lastFetched;
if (force && interval < MIN_BOARD_FORCE_INTERVAL) {
Log.i(TAG, "board is forced but interval=" + interval + " is less than min=" + MIN_BOARD_FORCE_INTERVAL + " so exiting");
return;
}
if (!force && interval < MIN_BOARD_FETCH_INTERVAL) {
Log.i(TAG, "board interval=" + interval + " less than min=" + MIN_BOARD_FETCH_INTERVAL + " and not force thus exiting service");
return;
}
} |
<<<<<<<
BMDistribution(CBMS cbms, Vector x) {
this.numLabels = cbms.numLabels;
this.numComponents = cbms.numComponents;
this.logProportions = cbms.multiClassClassifier.predictLogClassProbs(x);
this.logClassProbs = new double[numComponents][numLabels][2];
for (int l=0;l<numLabels;l++){
AugmentedLR augmentedLR = cbms.getBinaryClassifiers()[l];
double[][] lp = augmentedLR.logAugmentedProbs(x);
for (int k=0;k<numComponents;k++){
logClassProbs[k][l][0] = lp[k][0];
logClassProbs[k][l][1] = lp[k][1];
}
}
}
=======
BMDistribution(CBM cbm, Vector x, List<MultiLabel> support) {
this.numLabels = cbm.numLabels;
this.numComponents = cbm.numComponents;
this.logProportions = cbm.multiClassClassifier.predictLogClassProbs(x);
this.support = support;
this.ifSupport = true;
double[][] classScore = new double[numComponents][numLabels];
// #component * #support
this.normalizedLogProbs = new double[numComponents][support.size()];
for (int k=0; k<numComponents; k++) {
for (int l=0; l<numLabels;l++) {
classScore[k][l] = ((LogisticRegression) cbm.binaryClassifiers[k][l]).predictClassScores(x)[1];
}
double[] supportScores = new double[support.size()];
for (int s=0; s<support.size(); s++) {
MultiLabel label = support.get(s);
for (Integer l : label.getMatchedLabels()) {
supportScores[s] += classScore[k][l];
}
}
double[] supportProbs = MathUtil.softmax(supportScores);
for (int s=0; s<support.size(); s++) {
normalizedLogProbs[k][s] = Math.log(supportProbs[s]);
}
}
}
>>>>>>>
BMDistribution(CBMS cbms, Vector x) {
this.numLabels = cbms.numLabels;
this.numComponents = cbms.numComponents;
this.logProportions = cbms.multiClassClassifier.predictLogClassProbs(x);
this.logClassProbs = new double[numComponents][numLabels][2];
for (int l=0;l<numLabels;l++){
AugmentedLR augmentedLR = cbms.getBinaryClassifiers()[l];
double[][] lp = augmentedLR.logAugmentedProbs(x);
for (int k=0;k<numComponents;k++){
logClassProbs[k][l][0] = lp[k][0];
logClassProbs[k][l][1] = lp[k][1];
}
}
}
BMDistribution(CBM cbm, Vector x, List<MultiLabel> support) {
this.numLabels = cbm.numLabels;
this.numComponents = cbm.numComponents;
this.logProportions = cbm.multiClassClassifier.predictLogClassProbs(x);
this.support = support;
this.ifSupport = true;
double[][] classScore = new double[numComponents][numLabels];
// #component * #support
this.normalizedLogProbs = new double[numComponents][support.size()];
for (int k=0; k<numComponents; k++) {
for (int l=0; l<numLabels;l++) {
classScore[k][l] = ((LogisticRegression) cbm.binaryClassifiers[k][l]).predictClassScores(x)[1];
}
double[] supportScores = new double[support.size()];
for (int s=0; s<support.size(); s++) {
MultiLabel label = support.get(s);
for (Integer l : label.getMatchedLabels()) {
supportScores[s] += classScore[k][l];
}
}
double[] supportProbs = MathUtil.softmax(supportScores);
for (int s=0; s<support.size(); s++) {
normalizedLogProbs[k][s] = Math.log(supportProbs[s]);
}
}
} |
<<<<<<<
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 6, 1, extent), createKeyValue(COMPACTION_FINISH, 7, 1, null),
=======
KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(COMPACTION_FINISH, 4, 1, null),
>>>>>>>
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(COMPACTION_FINISH, 4, 1, null),
<<<<<<<
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 6, 1, extent), createKeyValue(MUTATION, 7, 1, m2),};
KeyValue entries3[] = {createKeyValue(OPEN, 8, -1, "1"),
createKeyValue(DEFINE_TABLET, 9, 1, extent), createKeyValue(COMPACTION_FINISH, 10, 1, null),
createKeyValue(MUTATION, 11, 1, m3),};
=======
KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(MUTATION, 4, 1, m2),};
KeyValue entries3[] = new KeyValue[] {createKeyValue(OPEN, 8, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(COMPACTION_FINISH, 4, 1, null),
createKeyValue(MUTATION, 4, 1, m3),};
>>>>>>>
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(MUTATION, 4, 1, m2),};
KeyValue entries3[] = {createKeyValue(OPEN, 8, -1, "1"),
createKeyValue(DEFINE_TABLET, 4, 1, extent), createKeyValue(COMPACTION_FINISH, 4, 1, null),
createKeyValue(MUTATION, 4, 1, m3),};
<<<<<<<
createKeyValue(COMPACTION_START, 2, 1, "/t1/f1"),
createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 3, 1, m),};
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
=======
createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"),
createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 4, 1, m),};
KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 5, -1, "1"),
>>>>>>>
createKeyValue(COMPACTION_START, 3, 1, "/t1/f1"),
createKeyValue(COMPACTION_FINISH, 4, 1, null), createKeyValue(MUTATION, 4, 1, m),};
KeyValue entries2[] = {createKeyValue(OPEN, 5, -1, "1"),
<<<<<<<
KeyValue entries2[] = {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 9, 11, e2), createKeyValue(COMPACTION_FINISH, 10, 11, null)};
=======
KeyValue entries2[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 9, 11, e2), createKeyValue(COMPACTION_FINISH, 8, 11, null)};
>>>>>>>
KeyValue entries2[] = {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 9, 11, e2), createKeyValue(COMPACTION_FINISH, 8, 11, null)};
<<<<<<<
KeyValue entries1[] = {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 100, 10, extent), createKeyValue(MUTATION, 100, 10, m1),
createKeyValue(COMPACTION_FINISH, 102, 10, null), createKeyValue(MUTATION, 105, 10, m2)};
=======
KeyValue entries1[] = new KeyValue[] {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 100, 10, extent),
createKeyValue(COMPACTION_FINISH, 102, 10, null), createKeyValue(MUTATION, 102, 10, m1)};
>>>>>>>
KeyValue entries1[] = {createKeyValue(OPEN, 0, -1, "1"),
createKeyValue(DEFINE_TABLET, 100, 10, extent),
createKeyValue(COMPACTION_FINISH, 102, 10, null), createKeyValue(MUTATION, 102, 10, m1)}; |
<<<<<<<
if (proxyUri != null) {
args.setProxyUri(proxyUri);
} else {
args.setProxyUri(fabricService.getMavenRepoURI());
}
fabricService.createContainer(args, name, number);
=======
Container[] containers = fabricService.createContainer(args, name, number);
// and set its profiles after creation
setProfiles(containers);
>>>>>>>
if (proxyUri != null) {
args.setProxyUri(proxyUri);
} else {
args.setProxyUri(fabricService.getMavenRepoURI());
}
Container[] containers = fabricService.createContainer(args, name, number);
// and set its profiles after creation
setProfiles(containers); |
<<<<<<<
import static com.google.common.base.Preconditions.checkArgument;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
=======
>>>>>>>
import static com.google.common.base.Preconditions.checkArgument;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
<<<<<<<
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.NamingThreadFactory;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
import com.google.common.base.Joiner;
public class TableOperationsImpl extends TableOperationsHelper {
private Instance instance;
private Credentials credentials;
public static final String CLONE_EXCLUDE_PREFIX = "!";
private static final Logger log = Logger.getLogger(TableOperations.class);
=======
import org.apache.accumulo.core.security.thrift.TCredentials;
>>>>>>>
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
import org.apache.accumulo.core.util.MapCounter;
import org.apache.accumulo.core.util.NamingThreadFactory;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.volume.VolumeConfiguration;
import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.thrift.TApplicationException;
import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransportException;
import org.apache.accumulo.core.security.thrift.TCredentials;
import com.google.common.base.Joiner;
public class TableOperationsImpl extends TableOperationsHelper {
private Instance instance;
private Credentials credentials;
public static final String CLONE_EXCLUDE_PREFIX = "!";
private static final Logger log = Logger.getLogger(TableOperations.class); |
<<<<<<<
=======
testImport.setZooKeeper(zookeeper);
>>>>>>>
testImport.setZooKeeper(zookeeper); |
<<<<<<<
/**
* The duration of the "Appear" animation per new cell being added.
* Note that the total time of the "Appear" animation will be based on the cumulative
* total of this animation playing on each cell
*/
public int newCellsAdditionAnimationDurationPerCell = 200;
/**
* The duration of the "Disappearing" animation per old cell being removed.
* Note that the total time of the "Disappearing" animation will be based on the cumulative
* total of this animation playing on each cell being removed
*/
public int oldCellsRemovalAnimationDuration = 200;
private int cellPositionTransitionAnimationDuration = 750;
=======
private int duration = 250;
>>>>>>>
/**
* The duration of the "Appear" animation per new cell being added.
* Note that the total time of the "Appear" animation will be based on the cumulative
* total of this animation playing on each cell
*/
public int newCellsAdditionAnimationDurationPerCell = 200;
/**
* The duration of the "Disappearing" animation per old cell being removed.
* Note that the total time of the "Disappearing" animation will be based on the cumulative
* total of this animation playing on each cell being removed
*/
public int oldCellsRemovalAnimationDuration = 200;
private int cellPositionTransitionAnimationDuration = 250; |
<<<<<<<
=======
private Runnable mPerformClick;
private Runnable mPendingCheckForTap;
private Runnable mPendingCheckForLongPress;
// This flag controls whether onTap/onLongPress/onTouch trigger
// the ActionMode
//private boolean mDataChanged = false;
private ContextMenuInfo mContextMenuInfo = null;
private SimpleArrayMap<Position2D, Boolean> mCheckStates = null;
ActionMode mChoiceActionMode;
MultiChoiceModeWrapper mMultiChoiceModeCallback;
/**
* Normal list that does not indicate choices
*/
public static final int CHOICE_MODE_NONE = 0;
/**
* The list allows up to one choice
*/
public static final int CHOICE_MODE_SINGLE = 1;
/**
* The list allows multiple choices
*/
public static final int CHOICE_MODE_MULTIPLE = 2;
/**
* The list allows multiple choices in a modal selection mode
*/
public static final int CHOICE_MODE_MULTIPLE_MODAL = 3;
int mChoiceMode = CHOICE_MODE_NONE;
>>>>>>>
private Runnable mPerformClick;
private Runnable mPendingCheckForTap;
private Runnable mPendingCheckForLongPress;
// This flag controls whether onTap/onLongPress/onTouch trigger
// the ActionMode
// private boolean mDataChanged = false;
private ContextMenuInfo mContextMenuInfo = null;
private SimpleArrayMap<Position2D, Boolean> mCheckStates = null;
ActionMode mChoiceActionMode;
MultiChoiceModeWrapper mMultiChoiceModeCallback;
/**
* Normal list that does not indicate choices
*/
public static final int CHOICE_MODE_NONE = 0;
/**
* The list allows up to one choice
*/
public static final int CHOICE_MODE_SINGLE = 1;
/**
* The list allows multiple choices
*/
public static final int CHOICE_MODE_MULTIPLE = 2;
/**
* The list allows multiple choices in a modal selection mode
*/
public static final int CHOICE_MODE_MULTIPLE_MODAL = 3;
int mChoiceMode = CHOICE_MODE_NONE;
<<<<<<<
int widthSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.width(), MeasureSpec.EXACTLY);
int heightSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.height(), MeasureSpec.EXACTLY);
=======
int widthSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.width(),
MeasureSpec.EXACTLY);
int heightSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.height(),
MeasureSpec.EXACTLY);
>>>>>>>
int widthSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.width(), MeasureSpec.EXACTLY);
int heightSpec = MeasureSpec.makeMeasureSpec(frameDesc.frame.height(), MeasureSpec.EXACTLY);
<<<<<<<
view.layout(frame.left - viewPortX, frame.top - viewPortY, frame.right - viewPortX, frame.bottom - viewPortY);
=======
view.layout(frame.left - viewPortX, frame.top - viewPortY, frame.left
+ frame.width() - viewPortX, frame.top + frame.height()
- viewPortY);
>>>>>>>
view.layout(frame.left - viewPortX, frame.top - viewPortY, frame.right - viewPortX, frame.bottom - viewPortY);
<<<<<<<
=======
//
// for (Pair<ItemProxy, Rect> item : changeSet.getMoved()) {
// ItemProxy proxy = ItemProxy.clone(item.first);
// View v = proxy.view;
// proxy.view.layout(proxy.frame.left, proxy.frame.top,
// proxy.frame.right, proxy.frame.bottom);
// }
//
//
// for (ItemProxy proxy : changeSet.getRemoved()) {
// View v = proxy.view;
//
// removeView(v);
//
// returnItemToPoolIfNeeded(proxy);
// }
//
// requestLayout();
>>>>>>>
<<<<<<<
// if (moveEvenIfSame || !old.compareRect(((ItemProxy)
// m.getValue()).frame)) {
if (moveEvenIfSame || !old.frame.equals(((ItemProxy) m.getValue()).frame)) {
=======
// if (moveEvenIfSame || !old.compareRect(((ItemProxy)
// m.getValue()).frame)) {
if (moveEvenIfSame
|| !old.frame.equals(((ItemProxy) m.getValue()).frame)) {
>>>>>>>
// if (moveEvenIfSame || !old.compareRect(((ItemProxy)
// m.getValue()).frame)) {
if (moveEvenIfSame || !old.frame.equals(((ItemProxy) m.getValue()).frame)) {
<<<<<<<
beginTouchAt = ViewUtils.getItemAt(frames, (int) (viewPortX + event.getX()),
(int) (viewPortY + event.getY()));
if (canScroll) {
=======
beginTouchAt = ViewUtils.getItemAt(frames,
(int) (viewPortX + event.getX()),
(int) (viewPortY + event.getY()));
if (canScroll) {
>>>>>>>
beginTouchAt = ViewUtils.getItemAt(frames, (int) (viewPortX + event.getX()),
(int) (viewPortY + event.getY()));
if (canScroll) {
<<<<<<<
if (canScroll) {
=======
if (canScroll) {
>>>>>>>
if (canScroll) {
<<<<<<<
@Override
public void run() {
mTouchModeReset = null;
mTouchMode = TOUCH_MODE_REST;
if (beginTouchAt != null && beginTouchAt.view != null) {
beginTouchAt.view.setPressed(false);
}
if (mOnItemSelectedListener != null) {
mOnItemSelectedListener.onItemSelected(Container.this, selectedItemProxy);
}
// setPressed(false);
// if (!mDataChanged && isAttachedToWindow()) {
// performClick.run();
// }
}
};
selectedItemProxy = beginTouchAt;
postDelayed(mTouchModeReset, ViewConfiguration.getPressedStateDuration());
=======
@Override
public void run() {
mTouchModeReset = null;
mTouchMode = TOUCH_MODE_REST;
if (beginTouchAt != null
&& beginTouchAt.view != null) {
Log.d(TAG, "setting pressed back to false in reset");
beginTouchAt.view.setPressed(false);
}
if (mOnItemSelectedListener != null) {
mOnItemSelectedListener.onItemSelected(
Container.this, selectedItemProxy);
}
// setPressed(false);
//if (!mDataChanged) {
mPerformClick = new PerformClick();
mPerformClick.run();
//}
}
};
selectedItemProxy = beginTouchAt;
postDelayed(mTouchModeReset,
ViewConfiguration.getPressedStateDuration());
>>>>>>>
@Override
public void run() {
mTouchModeReset = null;
mTouchMode = TOUCH_MODE_REST;
if (beginTouchAt != null && beginTouchAt.view != null) {
Log.d(TAG, "setting pressed back to false in reset");
beginTouchAt.view.setPressed(false);
}
if (mOnItemSelectedListener != null) {
mOnItemSelectedListener.onItemSelected(Container.this, selectedItemProxy);
}
// setPressed(false);
// if (!mDataChanged) {
mPerformClick = new PerformClick();
mPerformClick.run();
// }
}
};
selectedItemProxy = beginTouchAt;
postDelayed(mTouchModeReset, ViewConfiguration.getPressedStateDuration());
<<<<<<<
=======
Log.d("blah", "added = " + changeSet.added.size() + ", moved = "
+ changeSet.moved.size());
>>>>>>> |
<<<<<<<
playedsong = song;
preview.stop();
main.changeState(MainStateType.DECIDE);
search.unfocus(this);
banners.disposeOld();
stagefiles.disposeOld();
=======
changeState(MainStateType.DECIDE);
>>>>>>>
playedsong = song;
changeState(MainStateType.DECIDE);
<<<<<<<
playedsong = song;
preview.stop();
main.changeState(MainStateType.DECIDE);
search.unfocus(this);
banners.disposeOld();
stagefiles.disposeOld();
=======
changeState(MainStateType.DECIDE);
>>>>>>>
playedsong = song;
changeState(MainStateType.DECIDE);
<<<<<<<
playedcourse = course.getCourseData();
preview.stop();
=======
>>>>>>> |
<<<<<<<
SkinImage line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 20, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
=======
line = new SkinImage[1];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 20, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
>>>>>>>
SkinImage judgeline = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
judgeline.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(judgeline, 0, 20, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(judgeline);
line = new SkinImage[1];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 20, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
<<<<<<<
SkinImage line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 870, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
=======
line = new SkinImage[1];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 870, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
>>>>>>>
SkinImage judgeline = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
judgeline.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(judgeline, 0, 870, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(judgeline);
line = new SkinImage[1];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 870, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
<<<<<<<
SkinImage line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 345, 137, 590, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
=======
>>>>>>>
SkinImage line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 345, 137, 590, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
<<<<<<<
SkinImage line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 210, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
line = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
line.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(line, 0, 680, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(line);
=======
line = new SkinImage[2];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 210, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
line[1] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[1], 0, 680, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
>>>>>>>
SkinImage judgeline = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
judgeline.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(judgeline, 0, 210, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(judgeline);
judgeline = new SkinImage(new TextureRegion[]{new TextureRegion(st, 16,0,8,8)},0);
judgeline.setOffsetYReferenceID(BMSPlayer.OFFSET_LIFT);
setDestination(judgeline, 0, 680, 137, 390, 6, 0, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0);
add(judgeline);
line = new SkinImage[2];
line[0] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[0], 0, 210, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0);
line[1] = new SkinImage(new TextureRegion[]{new TextureRegion(st,0,0,1,1)},0);
setDestination(line[1], 0, 680, 140, 390, 1, 0, 255,255,255,255,0,0,0,0,0,0,0,0,0); |
<<<<<<<
private boolean selectPressed;
=======
>>>>>>>
private boolean selectPressed;
<<<<<<<
Keys.C, Keys.F, Keys.V, Keys.SHIFT_LEFT, Keys.CONTROL_LEFT };
private int[] numbers = new int[] { Keys.NUM_0, Keys.NUM_1, Keys.NUM_2, Keys.NUM_3};
private int[] cover = new int[] { Keys.UP, Keys.DOWN, Keys.LEFT, Keys.RIGHT };
private int[] function = new int[]{Keys.F1, Keys.F2, Keys.F3, Keys.F4, Keys.F5, Keys.F6
, Keys.F7, Keys.F8, Keys.F9, Keys.F10, Keys.F11, Keys.F12};
private int[] control = new int[] { Keys.Q, Keys.W };
=======
Keys.C, Keys.F, Keys.V, Keys.SHIFT_LEFT, Keys.CONTROL_LEFT,
Keys.COMMA, Keys.L, Keys.PERIOD, Keys.SEMICOLON, Keys.SLASH,
Keys.APOSTROPHE, Keys.UNKNOWN, Keys.SHIFT_RIGHT,
Keys.CONTROL_RIGHT };
private int[] numbers = new int[] { Keys.NUM_0, Keys.NUM_1, Keys.NUM_2,
Keys.NUM_3 };
private int[] cover = new int[] { Keys.UP, Keys.DOWN, Keys.LEFT,
Keys.RIGHT };
private int[] function = new int[] { Keys.F1, Keys.F2, Keys.F3,
Keys.F4, Keys.F5, Keys.F6, Keys.F7, Keys.F8, Keys.F9, Keys.F10,
Keys.F11, Keys.F12 };
private int[] control = new int[] { Keys.Q };
>>>>>>>
Keys.C, Keys.F, Keys.V, Keys.SHIFT_LEFT, Keys.CONTROL_LEFT,
Keys.COMMA, Keys.L, Keys.PERIOD, Keys.SEMICOLON, Keys.SLASH,
Keys.APOSTROPHE, Keys.UNKNOWN, Keys.SHIFT_RIGHT,
Keys.CONTROL_RIGHT };
private int[] numbers = new int[] { Keys.NUM_0, Keys.NUM_1, Keys.NUM_2,
Keys.NUM_3 };
private int[] cover = new int[] { Keys.UP, Keys.DOWN, Keys.LEFT,
Keys.RIGHT };
private int[] function = new int[] { Keys.F1, Keys.F2, Keys.F3,
Keys.F4, Keys.F5, Keys.F6, Keys.F7, Keys.F8, Keys.F9, Keys.F10,
Keys.F11, Keys.F12 };
private int[] control = new int[] { Keys.Q, Keys.W }; |
<<<<<<<
switch(config.getAudioDriver()) {
case Config.AUDIODRIVER_SOUND:
audio = new SoundProcessor();
break;
case Config.AUDIODRIVER_AUDIODEVICE:
audio = new AudioDeviceProcessor();
break;
case Config.AUDIODRIVER_ASIO:
audio = new ASIOProcessor();
break;
}
=======
>>>>>>> |
<<<<<<<
if (config.getLR2PlaySkinPath() != null) {
try {
skin = new LR2PlaySkinLoader().loadPlaySkin(new File(config.getLR2PlaySkinPath()));
} catch (IOException e) {
e.printStackTrace();
skin = new PlaySkin(model.getUseKeys(), main.RESOLUTION[resource.getConfig().getResolution()]);
}
} else {
skin = new PlaySkin(model.getUseKeys(), main.RESOLUTION[resource.getConfig().getResolution()]);
}
this.setSkin(skin);
if (autoplay == 2) {
=======
if (autoplay >= 2) {
>>>>>>>
if (config.getLR2PlaySkinPath() != null) {
try {
skin = new LR2PlaySkinLoader().loadPlaySkin(new File(config.getLR2PlaySkinPath()));
} catch (IOException e) {
e.printStackTrace();
skin = new PlaySkin(model.getUseKeys(), main.RESOLUTION[resource.getConfig().getResolution()]);
}
} else {
skin = new PlaySkin(model.getUseKeys(), main.RESOLUTION[resource.getConfig().getResolution()]);
}
this.setSkin(skin);
if (autoplay >= 2) {
<<<<<<<
keylog = createAutoplayLog(model);
} else if (autoplay == 2) {
=======
keylog = this.createAutoplayLog();
} else if (autoplay >= 2) {
>>>>>>>
keylog = createAutoplayLog(model);
} else if (autoplay >= 2) { |
<<<<<<<
private CommandBar[] commands = { new MyBestBar(), new ClearLampBar(GrooveGauge.CLEARTYPE_FULLCOMBO, "FULL COMBO") };
private List<SearchWordBar> search = new ArrayList<SearchWordBar>();
=======
private CommandBar[] commands;
>>>>>>>
private List<SearchWordBar> search = new ArrayList<SearchWordBar>();
private CommandBar[] commands;
<<<<<<<
((SongBar) bar).setExistsReplayData(main.getPlayDataAccessor().existsReplayData(sd.getSha256(),
sd.hasLongNote(), config.getLnmode()));
=======
boolean[] replay = new boolean[REPLAY];
for(int i = 0;i < REPLAY;i++) {
replay[i] = main.getPlayDataAccessor().existsReplayData(
sd.getSha256(), sd.hasLongNote(), config.getLnmode(), i);
}
((SongBar) bar).setExistsReplayData(replay);
>>>>>>>
boolean[] replay = new boolean[REPLAY];
for(int i = 0;i < REPLAY;i++) {
replay[i] = main.getPlayDataAccessor().existsReplayData(
sd.getSha256(), sd.hasLongNote(), config.getLnmode(), i);
}
((SongBar) bar).setExistsReplayData(replay);
<<<<<<<
gb.setExistsReplayData(main.getPlayDataAccessor()
.existsReplayData(hash, ln, config.getLnmode()));
=======
boolean[] replay = new boolean[REPLAY];
for(int i = 0;i < REPLAY;i++) {
replay[i] = main.getPlayDataAccessor().existsReplayData(
hash, ln, config.getLnmode(), 0);
}
gb.setExistsReplayData(replay);
>>>>>>>
boolean[] replay = new boolean[REPLAY];
for(int i = 0;i < REPLAY;i++) {
replay[i] = main.getPlayDataAccessor().existsReplayData(
hash, ln, config.getLnmode(), 0);
}
gb.setExistsReplayData(replay); |
<<<<<<<
this.keys = model.getUseKeys();
this.keyassign = keyassign;
this.noteassign = noteassign;
this.sckeyassign = sckeyassign;
this.sckey = sckey;
=======
>>>>>>>
<<<<<<<
if (j < 2 && bomb_timer >= 0) {
main.getTimer()[bomb_timer] = main.getNowTime();
=======
if (j < 2) {
main.getTimer()[TIMER_BOMB_1P_KEY1 + offset] = main.getNowTime();
>>>>>>>
if (j < 2) {
main.getTimer()[TIMER_BOMB_1P_KEY1 + offset] = main.getNowTime(); |
<<<<<<<
/*
* Copyright (C) 2012-2019 52°North Initiative for Geospatial Open Source
=======
/**
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source
>>>>>>>
/*
* Copyright (C) 2012-2020 52°North Initiative for Geospatial Open Source |
<<<<<<<
// 保存されているリプレイデータがない場合は、EASY以上で自動保存
if (resource.getAutoplay() == 0 && resource.getScoreData() != null
&& resource.getScoreData().getClear() >= Easy.id
&& !getMainController().getPlayDataAccessor().existsReplayData(resource.getBMSModel(),
resource.getPlayerConfig().getLnmode(), 0)) {
saveReplayData(0);
=======
// リプレイの自動保存
if(resource.getAutoplay() == 0){
for(int i=0;i<replay;i++){
/*
* コンフィグ値:0=保存しない 1=スコア更新時 2=スコアが自己ベスト以上 3=BP更新時 4=BPが自己ベスト以下
* 5=COMBO更新時 6=COMBOが自己ベスト以上 7=ランプ更新時 8=ランプが自己ベスト以上 9=毎回
*/
switch(resource.getConfig().getAutoSaveReplay()[i]){
case 0:
break;
case 1:
if(resource.getScoreData().getExscore() > oldexscore)
saveReplayData(i);
break;
case 2:
if(resource.getScoreData().getExscore() >= oldexscore)
saveReplayData(i);
break;
case 3:
if(resource.getScoreData().getMinbp() > oldmisscount || oldclear == NoPlay.id)
saveReplayData(i);
break;
case 4:
if(resource.getScoreData().getMinbp() >= oldmisscount || oldclear == NoPlay.id)
saveReplayData(i);
break;
case 5:
if(resource.getScoreData().getCombo() > oldcombo)
saveReplayData(i);
break;
case 6:
if(resource.getScoreData().getCombo() >= oldcombo)
saveReplayData(i);
break;
case 7:
if(resource.getScoreData().getClear() > oldclear)
saveReplayData(i);
break;
case 8:
if(resource.getScoreData().getClear() >= oldclear)
saveReplayData(i);
break;
case 9:
saveReplayData(i);
break;
}
}
>>>>>>>
// リプレイの自動保存
if(resource.getAutoplay() == 0){
for(int i=0;i<replay;i++){
/*
* コンフィグ値:0=保存しない 1=スコア更新時 2=スコアが自己ベスト以上 3=BP更新時 4=BPが自己ベスト以下
* 5=COMBO更新時 6=COMBOが自己ベスト以上 7=ランプ更新時 8=ランプが自己ベスト以上 9=毎回
*/
switch(resource.getConfig().getAutoSaveReplay()[i]){
case 0:
break;
case 1:
if(resource.getScoreData().getExscore() > oldexscore)
saveReplayData(i);
break;
case 2:
if(resource.getScoreData().getExscore() >= oldexscore)
saveReplayData(i);
break;
case 3:
if(resource.getScoreData().getMinbp() > oldmisscount || oldclear == NoPlay.id)
saveReplayData(i);
break;
case 4:
if(resource.getScoreData().getMinbp() >= oldmisscount || oldclear == NoPlay.id)
saveReplayData(i);
break;
case 5:
if(resource.getScoreData().getCombo() > oldcombo)
saveReplayData(i);
break;
case 6:
if(resource.getScoreData().getCombo() >= oldcombo)
saveReplayData(i);
break;
case 7:
if(resource.getScoreData().getClear() > oldclear)
saveReplayData(i);
break;
case 8:
if(resource.getScoreData().getClear() >= oldclear)
saveReplayData(i);
break;
case 9:
saveReplayData(i);
break;
}
}
<<<<<<<
resource.getPlayerConfig().getLnmode(), index);
saveReplay = index;
=======
resource.getConfig().getLnmode(), index);
saveReplay[index] = 1;
>>>>>>>
resource.getPlayerConfig().getLnmode(), index);
saveReplay[index] = 1; |
<<<<<<<
if(resource.getCourseBMSModels() != null) {
// 段位ゲージ
switch (g) {
case 0:
case 1:
case 2:
gauge = new GradeGrooveGauge(model);
break;
case 3:
case 4:
gauge = new ExgradeGrooveGauge(model);
break;
}
} else {
switch (g) {
case 0:
gauge = new AssistEasyGrooveGauge(model);
break;
case 1:
gauge = new EasyGrooveGauge(model);
break;
case 2:
gauge = new NormalGrooveGauge(model);
break;
case 3:
gauge = new HardGrooveGauge(model);
break;
case 4:
gauge = new ExhardGrooveGauge(model);
break;
}
}
float[] f = resource.getGauge();
if(f != null) {
gauge.setValue(f[f.length - 1]);
=======
switch (g) {
case 0:
gauge = new AssistEasyGrooveGauge(model);
break;
case 1:
gauge = new EasyGrooveGauge(model);
break;
case 2:
gauge = new NormalGrooveGauge(model);
break;
case 3:
gauge = new HardGrooveGauge(model);
break;
case 4:
gauge = new ExhardGrooveGauge(model);
break;
case 5:
gauge = new HazardGrooveGauge(model);
break;
>>>>>>>
if(resource.getCourseBMSModels() != null) {
// 段位ゲージ
switch (g) {
case 0:
case 1:
case 2:
gauge = new GradeGrooveGauge(model);
break;
case 3:
case 4:
gauge = new ExgradeGrooveGauge(model);
break;
}
} else {
switch (g) {
case 0:
gauge = new AssistEasyGrooveGauge(model);
break;
case 1:
gauge = new EasyGrooveGauge(model);
break;
case 2:
gauge = new NormalGrooveGauge(model);
break;
case 3:
gauge = new HardGrooveGauge(model);
break;
case 4:
gauge = new ExhardGrooveGauge(model);
break;
case 5:
gauge = new HazardGrooveGauge(model);
break;
}
}
float[] f = resource.getGauge();
if(f != null) {
gauge.setValue(f[f.length - 1]); |
<<<<<<<
input.dispose();
=======
SkinLoader.getResource().dispose();
>>>>>>>
input.dispose();
SkinLoader.getResource().dispose(); |
<<<<<<<
import bms.player.beatoraja.input.MusicSelectorInputProcessor;
import bms.player.lunaticrave2.*;
import bms.table.*;
=======
import bms.player.beatoraja.input.BMSPlayerInputProcessor;
import bms.player.lunaticrave2.FolderData;
import bms.player.lunaticrave2.IRScoreData;
import bms.player.lunaticrave2.LunaticRave2ScoreDatabaseManager;
import bms.player.lunaticrave2.LunaticRave2SongDatabaseManager;
import bms.player.lunaticrave2.SongData;
import bms.table.DifficultyTable;
>>>>>>>
import bms.player.lunaticrave2.*;
import bms.table.*;
import bms.player.beatoraja.input.BMSPlayerInputProcessor;
<<<<<<<
public void create(PlayerResource resource) {
this.resource = resource;
if(this.resource == null) {
this.resource = new PlayerResource();
}
=======
public void create() {
>>>>>>>
public void create(PlayerResource resource) {
this.resource = resource;
if(this.resource == null) {
this.resource = new PlayerResource();
} |
<<<<<<<
import bms.player.beatoraja.decide.MusicDecideSkin;
import bms.player.beatoraja.gauge.GrooveGauge;
import bms.player.beatoraja.skin.LR2DecideSkinLoader;
import bms.player.beatoraja.skin.LR2ResultSkinLoader;
import bms.player.beatoraja.skin.SkinImage;
import bms.player.beatoraja.skin.SkinObject;
=======
>>>>>>>
import bms.player.beatoraja.gauge.GrooveGauge;
import bms.player.beatoraja.skin.LR2ResultSkinLoader;
import bms.player.beatoraja.skin.SkinImage; |
<<<<<<<
if (!bmsfiles.isEmpty()) {
BMSFolderThread task = new BMSFolderThread(conn, bmsfiles, records, updateFolder, txt, updatetime,
tags, info);
=======
final boolean containsBMS = bmsfiles.size() > 0;
if (containsBMS) {
BMSFolderThread task = new BMSFolderThread(conn, bmsfiles.toArray(new Path[bmsfiles.size()]), records,
updateFolder, txt, updatetime, previewpath, tags);
>>>>>>>
final boolean containsBMS = bmsfiles.size() > 0;
if (containsBMS) {
BMSFolderThread task = new BMSFolderThread(conn, bmsfiles.toArray(new Path[bmsfiles.size()]), records,
updateFolder, txt, updatetime, previewpath, tags, info);
<<<<<<<
public BMSFolderThread(Connection conn, List<Path> bmsfiles, List<SongData> records, boolean updateAll,
boolean txt, long updatetime, Map<String, String> tags, SongInformationAccessor info) {
=======
public BMSFolderThread(Connection conn, Path[] bmsfiles, List<SongData> records, boolean updateAll, boolean txt,
long updatetime, String preview, Map<String, String> tags) {
>>>>>>>
public BMSFolderThread(Connection conn, Path[] bmsfiles, List<SongData> records, boolean updateAll, boolean txt,
long updatetime, String preview, Map<String, String> tags, SongInformationAccessor info) { |
<<<<<<<
this.playconfig = main.getPlayConfig(this.config);
=======
this.playconfig = (model.getMode() == Mode.BEAT_5K || model.getMode() == Mode.BEAT_7K ? config.getMode7()
: (model.getMode() == Mode.BEAT_10K || model.getMode() == Mode.BEAT_14K ? config.getMode14()
: config.getMode9()));
>>>>>>>
this.playconfig = main.getPlayConfig(this.config);
<<<<<<<
switch (model.getUseKeys()) {
case 7:
case 5:
case 14:
case 10:
laneassign = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16 };
break;
case 9:
laneassign = new int[] { 0, 1, 2, 3, 4, 10, 11, 12, 13 };
break;
case 24:
laneassign = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 };
break;
}
=======
>>>>>>> |
<<<<<<<
=======
import bms.player.beatoraja.play.*;
>>>>>>>
import bms.player.beatoraja.play.*;
<<<<<<<
import bms.player.beatoraja.play.PlaySkin;
import static bms.player.beatoraja.skin.SkinProperty.*;
=======
>>>>>>>
import static bms.player.beatoraja.skin.SkinProperty.*; |
<<<<<<<
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
=======
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
>>>>>>>
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
<<<<<<<
import com.google.common.collect.Iterables;
=======
import com.google.common.annotations.VisibleForTesting;
>>>>>>>
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
<<<<<<<
import com.google.protobuf.InvalidProtocolBufferException;
import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
=======
>>>>>>>
import com.google.protobuf.InvalidProtocolBufferException; |
<<<<<<<
import org.devio.rn.splashscreen.SplashScreenReactPackage;
=======
import com.bugsnag.BugsnagReactNative;
import com.hieuvp.fingerprint.ReactNativeFingerprintScannerPackage;
>>>>>>>
import com.bugsnag.BugsnagReactNative;
import com.hieuvp.fingerprint.ReactNativeFingerprintScannerPackage;
import org.devio.rn.splashscreen.SplashScreenReactPackage;
<<<<<<<
new RNIsDeviceRootedPackage(),
new SplashScreenReactPackage()
=======
new RNIsDeviceRootedPackage(),
new ReactNativeFingerprintScannerPackage(),
BugsnagReactNative.getPackage()
>>>>>>>
new RNIsDeviceRootedPackage(),
new SplashScreenReactPackage()
new ReactNativeFingerprintScannerPackage(),
BugsnagReactNative.getPackage() |
<<<<<<<
import com.oblador.vectoricons.VectorIconsPackage;
=======
import my.fin.RNIsDeviceRootedPackage;
>>>>>>>
import com.oblador.vectoricons.VectorIconsPackage;
import my.fin.RNIsDeviceRootedPackage;
<<<<<<<
new RandomBytesPackage(),
new VectorIconsPackage()
=======
new RNIsDeviceRootedPackage()
new RandomBytesPackage()
>>>>>>>
new RandomBytesPackage(),
new VectorIconsPackage()
new RNIsDeviceRootedPackage() |
<<<<<<<
mLuanFilesystem = new LuanFilesystem(_G, this);
t = mLuanFilesystem.InitLib();
_G.get("love").set("filesystem", t);
=======
mLuanFilesystem = new LuanFilesystem(_G);
_G.get("love").set("filesystem", mLuanFilesystem.InitLib());
>>>>>>>
mLuanFilesystem = new LuanFilesystem(_G, this);
_G.get("love").set("filesystem", mLuanFilesystem.InitLib()); |
<<<<<<<
=======
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.FloatBuffer;
import java.util.HashMap;
>>>>>>> |
<<<<<<<
private LuanKeyboard mLuanKeyboard;
=======
private GL10 gl;
private boolean bOnCreateDone = false;
private boolean bInitDone = false;
>>>>>>>
private LuanKeyboard mLuanKeyboard;
private GL10 gl;
private boolean bOnCreateDone = false;
private boolean bInitDone = false; |
<<<<<<<
import java.util.Random;
=======
import java.util.LinkedList;
>>>>>>>
import java.util.Random;
import java.util.LinkedList;
<<<<<<<
// ***** ***** ***** ***** ***** utils
public float getRandomFloat () { return mRandom.nextFloat(); } // [0;1[
public float getRandomFloatBetween (float a,float b) { return a + mRandom.nextFloat() * (b-a); } // [a;b[
// ***** ***** ***** ***** ***** log
=======
// ***** ***** ***** ***** ***** log
>>>>>>>
// ***** ***** ***** ***** ***** utils
public float getRandomFloat () { return mRandom.nextFloat(); } // [0;1[
public float getRandomFloatBetween (float a,float b) { return a + mRandom.nextFloat() * (b-a); } // [a;b[
// ***** ***** ***** ***** ***** log
<<<<<<<
public float getTime () { return mLuanTimer.getTime(); } ///< in seconds
public LoveConfig getConfig() { return config; }
=======
>>>>>>>
public float getTime () { return mLuanTimer.getTime(); } ///< in seconds |
<<<<<<<
import static org.junit.Assert.assertTrue;
=======
import static com.google.common.base.Charsets.UTF_8;
>>>>>>>
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertTrue;
<<<<<<<
String rootPasswd;
if (token instanceof PasswordToken) {
rootPasswd = new String(((PasswordToken) token).getPassword(), Charsets.UTF_8);
} else {
rootPasswd = UUID.randomUUID().toString();
}
File baseDir = AccumuloClusterIT.createTestDir(testClassName + "_" + testMethodName);
MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(baseDir, rootPasswd);
=======
String passwd = new String(((PasswordToken) token).getPassword(), UTF_8);
MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(AccumuloClusterIT.createTestDir(testClassName + "_" + testMethodName), passwd);
>>>>>>>
String rootPasswd;
if (token instanceof PasswordToken) {
rootPasswd = new String(((PasswordToken) token).getPassword(), UTF_8);
} else {
rootPasswd = UUID.randomUUID().toString();
}
File baseDir = AccumuloClusterIT.createTestDir(testClassName + "_" + testMethodName);
MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(baseDir, rootPasswd); |
<<<<<<<
import java.io.*;
=======
import java.io.File;
import java.util.ArrayList;
>>>>>>>
import java.io.*;
import java.util.ArrayList; |
<<<<<<<
config.IS_QUERY_TEST = Boolean.parseBoolean(properties.getProperty("IS_QUERY_TEST", config.IS_QUERY_TEST+""));
config.QUERY_CHOICE = Integer.parseInt(properties.getProperty("QUERY_CHOICE", config.QUERY_CHOICE+""));
config.QUERY_SENSOR_NUM = Integer.parseInt(properties.getProperty("QUERY_SENSOR_NUM", config.QUERY_SENSOR_NUM+""));
config.QUERY_AGGREGATE_FUN = properties.getProperty("QUERY_AGGREGATE_FUN", config.QUERY_AGGREGATE_FUN);
=======
config.LOG_STOP_FLAG_PATH = properties.getProperty("LOG_STOP_FLAG_PATH", "/home/liurui");
>>>>>>>
config.IS_QUERY_TEST = Boolean.parseBoolean(properties.getProperty("IS_QUERY_TEST", config.IS_QUERY_TEST+""));
config.QUERY_CHOICE = Integer.parseInt(properties.getProperty("QUERY_CHOICE", config.QUERY_CHOICE+""));
config.QUERY_SENSOR_NUM = Integer.parseInt(properties.getProperty("QUERY_SENSOR_NUM", config.QUERY_SENSOR_NUM+""));
config.QUERY_AGGREGATE_FUN = properties.getProperty("QUERY_AGGREGATE_FUN", config.QUERY_AGGREGATE_FUN);
config.LOG_STOP_FLAG_PATH = properties.getProperty("LOG_STOP_FLAG_PATH", "/home/liurui"); |
<<<<<<<
LOGGER_RESULT.info("Loaded ,{}, points in ,{}, seconds, mean rate ,{}, points/s; Total error point num is ,{}, create schema cost ,{}, seconds",
totalPoints,
totalTime / 1000.0f,
1000.0f * (totalPoints - totalErrorPoint) / (float) totalTime,
totalErrorPoint,
createSchemaTime);
mysql.saveInsertResult(totalPoints, totalTime / 1000.0f, config.CLIENT_NUMBER,
totalErrorPoint,createSchemaTime,config.REMARK);
=======
mysql.saveResult("createSchemaTime(s)", ""+createSchemaTime);
mysql.saveResult("totalPoints", ""+totalPoints);
mysql.saveResult("totalTime(s)", ""+totalTime / 1000.0f);
mysql.saveResult("totalErrorPoint", ""+totalErrorPoint);
>>>>>>>
LOGGER_RESULT.info("Loaded ,{}, points in ,{}, seconds, mean rate ,{}, points/s; Total error point num is ,{}, create schema cost ,{}, seconds",
totalPoints,
totalTime / 1000.0f,
1000.0f * (totalPoints - totalErrorPoint) / (float) totalTime,
totalErrorPoint,
createSchemaTime);
mysql.saveResult("createSchemaTime(s)", ""+createSchemaTime);
mysql.saveResult("totalPoints", ""+totalPoints);
mysql.saveResult("totalTime(s)", ""+totalTime / 1000.0f);
mysql.saveResult("totalErrorPoint", ""+totalErrorPoint);
<<<<<<<
LOGGER_RESULT.info("{}: execute ,{}, query in ,{}, seconds, get ,{}, result points with ,{}, workers, mean rate ,{}, query/s ,{}, points/s; Total error point number is ,{}",
getQueryName(config),
config.CLIENT_NUMBER * config.LOOP,
totalTime / 1000.0f,
totalResultPoint,
config.CLIENT_NUMBER,
1000.0f * config.CLIENT_NUMBER * config.LOOP / totalTime,
(1000.0f * totalResultPoint) / ((float) totalTime),
totalErrorPoint);
mySql.saveQueryResult(System.currentTimeMillis(), (long) config.CLIENT_NUMBER * config.LOOP, totalResultPoint,
totalTime / 1000.0f, config.CLIENT_NUMBER, (1000.0f * (totalResultPoint) )/ totalTime,
totalErrorPoint,config.REMARK);
=======
mySql.saveResult("queryNumber", ""+config.CLIENT_NUMBER * config.LOOP);
mySql.saveResult("totalPoint", ""+totalResultPoint);
mySql.saveResult("totalTime(s)", ""+totalTime / 1000.0f);
mySql.saveResult("resultPointPerSecond(points/s)", ""+(1000.0f * (totalResultPoint) )/ totalTime);
mySql.saveResult("totalErrorQuery", ""+totalErrorPoint);
>>>>>>>
LOGGER_RESULT.info("{}: execute ,{}, query in ,{}, seconds, get ,{}, result points with ,{}, workers, mean rate ,{}, query/s ,{}, points/s; Total error point number is ,{}",
getQueryName(config),
config.CLIENT_NUMBER * config.LOOP,
totalTime / 1000.0f,
totalResultPoint,
config.CLIENT_NUMBER,
1000.0f * config.CLIENT_NUMBER * config.LOOP / totalTime,
(1000.0f * totalResultPoint) / ((float) totalTime),
totalErrorPoint);
mySql.saveResult("queryNumber", ""+config.CLIENT_NUMBER * config.LOOP);
mySql.saveResult("totalPoint", ""+totalResultPoint);
mySql.saveResult("totalTime(s)", ""+totalTime / 1000.0f);
mySql.saveResult("resultPointPerSecond(points/s)", ""+(1000.0f * (totalResultPoint) )/ totalTime);
mySql.saveResult("totalErrorQuery", ""+totalErrorPoint); |
<<<<<<<
import net.minecraft.client.util.ITooltipFlag;
=======
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
>>>>>>>
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.player.EntityPlayer;
<<<<<<<
public void addInformation(ItemStack itemstack, @Nullable World world, List<String> info, ITooltipFlag par4) {
info.add(Translator.translateToLocal("tile.for.ffarm.tooltip"));
if (itemstack.getTagCompound() == null) {
return;
=======
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
if(GuiScreen.isShiftKeyDown()){
tooltip.add(Translator.translateToLocal("tile.for.ffarm.tooltip"));
if (stack.getTagCompound() == null) {
return;
}
EnumFarmBlockTexture texture = EnumFarmBlockTexture.getFromCompound(stack.getTagCompound());
tooltip.add(Translator.translateToLocal("tile.for.ffarm.material.tooltip") + texture.getFormatting() + TextFormatting.ITALIC + " "+ texture.getName());
}else{
ItemTooltipUtil.addShiftInformation(stack, player, tooltip, advanced);
>>>>>>>
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
if(GuiScreen.isShiftKeyDown()){
tooltip.add(Translator.translateToLocal("tile.for.ffarm.tooltip"));
if (stack.getTagCompound() == null) {
return;
}
EnumFarmBlockTexture texture = EnumFarmBlockTexture.getFromCompound(stack.getTagCompound());
tooltip.add(Translator.translateToLocal("tile.for.ffarm.material.tooltip") + texture.getFormatting() + TextFormatting.ITALIC + " "+ texture.getName());
}else{
ItemTooltipUtil.addShiftInformation(stack, world, tooltip, flag); |
<<<<<<<
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.FluidRegistry;
import forestry.api.climate.IClimateControl;
import forestry.api.climate.IClimatePosition;
import forestry.api.climate.IClimateRegion;
import forestry.api.climate.IClimateSourceProvider;
=======
import javax.annotation.Nonnull;
>>>>>>>
import javax.annotation.Nonnull;
import forestry.api.climate.IClimateControl;
import forestry.api.climate.IClimatePosition;
import forestry.api.climate.IClimateRegion;
import forestry.api.climate.IClimateSourceProvider;
<<<<<<<
protected ClimateControl climateControl;
protected ButterflyHatch butterflyHatch;
=======
>>>>>>>
protected ClimateControl climateControl;
protected ButterflyHatch butterflyHatch;
<<<<<<<
if(region == null){
return 0;
=======
int dimensionID = worldObj.provider.getDimension();
float temperature = 0.0F;
int positions = 0;
for(IInternalBlock internalBlock : internalBlocks){
IClimatePosition position = region.getPositions().get(internalBlock.getPos());
if(position != null){
positions++;
temperature+=position.getTemperature();
}
>>>>>>>
if(region == null){
return 0;
<<<<<<<
if(region == null){
return 0;
=======
int dimensionID = worldObj.provider.getDimension();
float humidity = 0.0F;
int positions = 0;
for(IInternalBlock internalBlock : internalBlocks){
IClimatePosition position = region.getPositions().get(internalBlock.getPos());
if(position != null){
positions++;
humidity+=position.getHumidity();
}
>>>>>>>
if(region == null){
return 0;
<<<<<<<
@Override
public IClimateControl getClimateControl() {
if(climateControl == null){
return DefaultClimateControl.instance;
=======
public static ButterflyHatch getGreenhouseButterflyHatch(World world, BlockPos pos) {
if (GreenhouseManager.greenhouseHelper.getGreenhouseController(world, pos) == null) {
return null;
}
IGreenhouseController controller = GreenhouseManager.greenhouseHelper.getGreenhouseController(world, pos);
for (IMultiblockComponent greenhouse : controller.getComponents()) {
if (greenhouse instanceof ButterflyHatch) {
return (ButterflyHatch) greenhouse;
}
>>>>>>>
@Override
public IClimateControl getClimateControl() {
if(climateControl == null){
return DefaultClimateControl.instance; |
<<<<<<<
energyStorage = new EnergyStorage(3300);
=======
Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS);
moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass);
moltenTank.tankMode = StandardTank.TankMode.INTERNAL;
tankManager = new TankManager(moltenTank);
moltenTankIndex = moltenTank.getTankIndex();
>>>>>>>
energyStorage = new EnergyStorage(3300);
Fluid liquidGlass = FluidRegistry.getFluid(Defaults.LIQUID_GLASS);
moltenTank = new FilteredTank(2 * Defaults.BUCKET_VOLUME, liquidGlass);
moltenTank.tankMode = StandardTank.TankMode.INTERNAL;
tankManager = new TankManager(moltenTank);
moltenTankIndex = moltenTank.getTankIndex(); |
<<<<<<<
public static final String CULTIVATION = "cultivation";
=======
public static final String SORTING = "sorting";
>>>>>>>
public static final String SORTING = "sorting";
public static final String CULTIVATION = "cultivation"; |
<<<<<<<
import static cpw.mods.fml.relauncher.FMLLaunchHandler.side;
import forestry.api.core.EnumErrorCode;
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import forestry.core.EnumErrorCode;
>>>>>>>
<<<<<<<
import forestry.core.inventory.TileInventoryAdapter;
import forestry.core.network.EntityNetData;
=======
>>>>>>>
import forestry.core.inventory.TileInventoryAdapter;
<<<<<<<
@EntityNetData
=======
>>>>>>> |
<<<<<<<
=======
import forestry.api.core.ForestryAPI;
>>>>>>> |
<<<<<<<
=======
import forestry.api.core.climate.IClimateRegion;
import forestry.api.core.climate.IClimateSource;
import net.minecraft.util.math.BlockPos;
>>>>>>>
<<<<<<<
region.updateClimate(ticks);
=======
if(ticks % region.getTicksPerUpdate() == 0){
region.updateClimate();
}
}
}
Map<Integer, Map<BlockPos, IClimateSource>> sources = ForestryAPI.climateManager.getSources();
if(sources != null && sources.containsKey(dim)){
for(IClimateSource source : sources.get(dim).values()){
IClimateRegion region = ForestryAPI.climateManager.getRegionForPos(event.world, source.getCoordinates());
if(region != null){
if(ticks % source.getTicksForChange(region) == 0){
source.changeClimate(ticks, region);
}
}
>>>>>>>
region.updateClimate(ticks); |
<<<<<<<
TreeMap<Long,TabletInfo> largestMemTablets = new LargestMap(maxMinCs);
final TreeMap<Long,TabletInfo> largestIdleMemTablets = new LargestMap(maxConcurrentMincs);
final long now = currentTimeMillis();
=======
LargestMap largestMemTablets = new LargestMap(maxMinCs);
final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs);
final long now = System.currentTimeMillis();
>>>>>>>
LargestMap largestMemTablets = new LargestMap(maxMinCs);
final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs);
final long now = currentTimeMillis(); |
<<<<<<<
import forestry.core.network.packets.CamouflageSelectionType;
import forestry.core.network.packets.PacketCamouflageSelectServer;
=======
import forestry.core.owner.IOwnedTile;
import forestry.core.owner.IOwnerHandler;
>>>>>>>
import forestry.core.network.packets.CamouflageSelectionType;
import forestry.core.network.packets.PacketCamouflageSelectServer;
import forestry.core.owner.IOwnedTile;
import forestry.core.owner.IOwnerHandler;
<<<<<<<
import cofh.api.energy.IEnergyConnection;
import cofh.api.energy.IEnergyHandler;
import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
=======
import forestry.greenhouse.network.packets.PacketCamouflageUpdate;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
>>>>>>>
import cofh.api.energy.IEnergyConnection;
import cofh.api.energy.IEnergyHandler;
import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
<<<<<<<
if (worldObj != null && worldObj.isRemote) {
Proxies.net.sendToServer(new PacketCamouflageSelectServer(this, type, CamouflageSelectionType.TILE));
=======
if (worldObj != null) {
if (worldObj.isRemote) {
Proxies.net.sendToServer(new PacketCamouflageUpdate(this, type));
worldObj.markBlockRangeForRenderUpdate(getPos(), getPos());
}
>>>>>>>
if (worldObj != null && worldObj.isRemote) {
Proxies.net.sendToServer(new PacketCamouflageSelectServer(this, type, CamouflageSelectionType.TILE)); |
<<<<<<<
import com.lilithsthrone.game.character.body.types.*;
import com.lilithsthrone.game.character.body.valueEnums.*;
import com.lilithsthrone.game.character.markings.*;
=======
import com.lilithsthrone.game.character.body.types.AbstractArmType;
import com.lilithsthrone.game.character.body.types.AbstractAssType;
import com.lilithsthrone.game.character.body.types.AbstractBreastType;
import com.lilithsthrone.game.character.body.types.AntennaType;
import com.lilithsthrone.game.character.body.types.ArmType;
import com.lilithsthrone.game.character.body.types.AssType;
import com.lilithsthrone.game.character.body.types.BodyCoveringType;
import com.lilithsthrone.game.character.body.types.BreastType;
import com.lilithsthrone.game.character.body.types.EarType;
import com.lilithsthrone.game.character.body.types.EyeType;
import com.lilithsthrone.game.character.body.types.FaceType;
import com.lilithsthrone.game.character.body.types.FootStructure;
import com.lilithsthrone.game.character.body.types.HairType;
import com.lilithsthrone.game.character.body.types.HornType;
import com.lilithsthrone.game.character.body.types.LegType;
import com.lilithsthrone.game.character.body.types.PenisType;
import com.lilithsthrone.game.character.body.types.SkinType;
import com.lilithsthrone.game.character.body.types.TailType;
import com.lilithsthrone.game.character.body.types.VaginaType;
import com.lilithsthrone.game.character.body.types.WingType;
import com.lilithsthrone.game.character.body.valueEnums.AreolaeSize;
import com.lilithsthrone.game.character.body.valueEnums.AssSize;
import com.lilithsthrone.game.character.body.valueEnums.BodyHair;
import com.lilithsthrone.game.character.body.valueEnums.BodySize;
import com.lilithsthrone.game.character.body.valueEnums.BreastShape;
import com.lilithsthrone.game.character.body.valueEnums.Capacity;
import com.lilithsthrone.game.character.body.valueEnums.ClitorisSize;
import com.lilithsthrone.game.character.body.valueEnums.CoveringModifier;
import com.lilithsthrone.game.character.body.valueEnums.CoveringPattern;
import com.lilithsthrone.game.character.body.valueEnums.CumProduction;
import com.lilithsthrone.game.character.body.valueEnums.CupSize;
import com.lilithsthrone.game.character.body.valueEnums.EyeShape;
import com.lilithsthrone.game.character.body.valueEnums.Femininity;
import com.lilithsthrone.game.character.body.valueEnums.HairLength;
import com.lilithsthrone.game.character.body.valueEnums.HairStyle;
import com.lilithsthrone.game.character.body.valueEnums.HipSize;
import com.lilithsthrone.game.character.body.valueEnums.HornLength;
import com.lilithsthrone.game.character.body.valueEnums.LabiaSize;
import com.lilithsthrone.game.character.body.valueEnums.LipSize;
import com.lilithsthrone.game.character.body.valueEnums.Muscle;
import com.lilithsthrone.game.character.body.valueEnums.NippleSize;
import com.lilithsthrone.game.character.body.valueEnums.OrificeElasticity;
import com.lilithsthrone.game.character.body.valueEnums.OrificeModifier;
import com.lilithsthrone.game.character.body.valueEnums.OrificePlasticity;
import com.lilithsthrone.game.character.body.valueEnums.PenetrationModifier;
import com.lilithsthrone.game.character.body.valueEnums.PenisGirth;
import com.lilithsthrone.game.character.body.valueEnums.PenisSize;
import com.lilithsthrone.game.character.body.valueEnums.PiercingType;
import com.lilithsthrone.game.character.body.valueEnums.TesticleSize;
import com.lilithsthrone.game.character.body.valueEnums.TongueLength;
import com.lilithsthrone.game.character.body.valueEnums.TongueModifier;
import com.lilithsthrone.game.character.body.valueEnums.Wetness;
import com.lilithsthrone.game.character.body.valueEnums.WingSize;
import com.lilithsthrone.game.character.effects.StatusEffect;
import com.lilithsthrone.game.character.markings.AbstractTattooType;
import com.lilithsthrone.game.character.markings.Tattoo;
import com.lilithsthrone.game.character.markings.TattooCountType;
import com.lilithsthrone.game.character.markings.TattooCounter;
import com.lilithsthrone.game.character.markings.TattooCounterType;
import com.lilithsthrone.game.character.markings.TattooType;
import com.lilithsthrone.game.character.markings.TattooWriting;
import com.lilithsthrone.game.character.markings.TattooWritingStyle;
>>>>>>>
import com.lilithsthrone.game.character.body.types.*;
import com.lilithsthrone.game.character.body.valueEnums.*;
import com.lilithsthrone.game.character.effects.StatusEffect;
import com.lilithsthrone.game.character.markings.*; |
<<<<<<<
public static List<Colour> naturalScaleColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.COVERING_WHITE),
new ListValue<Colour>(Colour.COVERING_BROWN),
new ListValue<Colour>(Colour.COVERING_BROWN_DARK),
new ListValue<Colour>(Colour.COVERING_BLACK));
public static List<Colour> dyeScaleColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.COVERING_BLEACH_BLONDE),
new ListValue<Colour>(Colour.COVERING_BLONDE),
new ListValue<Colour>(Colour.COVERING_BLUE),
new ListValue<Colour>(Colour.COVERING_GINGER),
new ListValue<Colour>(Colour.COVERING_GREEN),
new ListValue<Colour>(Colour.COVERING_PINK),
new ListValue<Colour>(Colour.COVERING_PURPLE),
new ListValue<Colour>(Colour.COVERING_RED));
=======
public static List<Colour> hornColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.HORN_WHITE),
new ListValue<Colour>(Colour.HORN_RED),
new ListValue<Colour>(Colour.HORN_GREY),
new ListValue<Colour>(Colour.HORN_DARK_GREY),
new ListValue<Colour>(Colour.HORN_BLACK));
>>>>>>>
public static List<Colour> naturalScaleColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.COVERING_WHITE),
new ListValue<Colour>(Colour.COVERING_BROWN),
new ListValue<Colour>(Colour.COVERING_BROWN_DARK),
new ListValue<Colour>(Colour.COVERING_BLACK));
public static List<Colour> dyeScaleColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.COVERING_BLEACH_BLONDE),
new ListValue<Colour>(Colour.COVERING_BLONDE),
new ListValue<Colour>(Colour.COVERING_BLUE),
new ListValue<Colour>(Colour.COVERING_GINGER),
new ListValue<Colour>(Colour.COVERING_GREEN),
new ListValue<Colour>(Colour.COVERING_PINK),
new ListValue<Colour>(Colour.COVERING_PURPLE),
new ListValue<Colour>(Colour.COVERING_RED));
public static List<Colour> hornColours = Util.newArrayListOfValues(
new ListValue<Colour>(Colour.HORN_WHITE),
new ListValue<Colour>(Colour.HORN_RED),
new ListValue<Colour>(Colour.HORN_GREY),
new ListValue<Colour>(Colour.HORN_DARK_GREY),
new ListValue<Colour>(Colour.HORN_BLACK)); |
<<<<<<<
import com.lilithsthrone.game.character.persona.*;
=======
import com.lilithsthrone.game.character.persona.Occupation;
import com.lilithsthrone.game.character.persona.NameTriplet;
import com.lilithsthrone.game.character.persona.PersonalityTrait;
import com.lilithsthrone.game.character.persona.PersonalityWeight;
import com.lilithsthrone.game.character.persona.SexualOrientation;
>>>>>>>
import com.lilithsthrone.game.character.persona.*;
<<<<<<<
import com.lilithsthrone.game.dialogue.*;
=======
import com.lilithsthrone.game.dialogue.DebugDialogue;
import com.lilithsthrone.game.dialogue.DialogueFlagValue;
import com.lilithsthrone.game.dialogue.DialogueNodeOld;
import com.lilithsthrone.game.dialogue.DialogueNodeType;
import com.lilithsthrone.game.dialogue.OccupantManagementDialogue;
>>>>>>>
import com.lilithsthrone.game.dialogue.*;
<<<<<<<
import com.lilithsthrone.game.slavery.*;
=======
>>>>>>>
<<<<<<<
|| Main.game.getCurrentDialogueNode().equals(PhoneDialogue.CHARACTER_APPEARANCE)
|| Main.game.getCurrentDialogueNode().equals(SlaveryManagementDialogue.SLAVE_MANAGEMENT_INSPECT)) {
GameCharacter character = Main.game.getCurrentDialogueNode().equals(PhoneDialogue.CHARACTER_APPEARANCE) ? Main.game.getPlayer() : CharactersPresentDialogue.characterViewed;
if(character instanceof GameCharacter) {
id = "ARTWORK_ADD";
if (MainController.document.getElementById(id) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
// Create file chooser for .jpg and .png images in the most recently used directory
FileChooser chooser = new FileChooser();
chooser.setTitle("Add Images");
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Images", "*.jpg", "*.png"));
if (lastOpened != null)
chooser.setInitialDirectory(lastOpened);
List<File> files = chooser.showOpenMultipleDialog(Main.primaryStage);
if (files != null && !files.isEmpty()) {
lastOpened = files.get(0).getParentFile();
character.importImages(files);
if (!character.isPlayer()) CharactersPresentDialogue.resetContent(character);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
}
}, false);
MainController.addEventListener(MainController.document, id, "mousemove", MainController.moveTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseleave", MainController.hideTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseenter", new TooltipInformationEventListener().setInformation(
"Add custom artwork","Browse your own images and add them to the character."),false);
}
if (character.hasArtwork()) {
try {
Artwork artwork = character.getCurrentArtwork();
id = "ARTWORK_INFO";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(!artwork.getArtist().getWebsites().isEmpty()) {
Util.openLinkInDefaultBrowser(artwork.getArtist().getWebsites().get(0).getURL());
}
}, false);
MainController.addEventListener(MainController.document, id, "mousemove", MainController.moveTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseleave", MainController.hideTooltipListener, false);
String description;
if (artwork.getArtist().getName().equals("Custom")) {
description = "You added this yourself.";
} else if (artwork.getArtist().getWebsites().isEmpty()) {
description = "This artist has no associated websites!";
} else {
description = "Click to open <b style='color:"+artwork.getArtist().getColour().toWebHexString()+";'>"+artwork.getArtist().getWebsites().get(0).getName()+"</b>"
+ " ("+artwork.getArtist().getWebsites().get(0).getURL()+") <b>externally</b> in your default browser!";
=======
|| Main.game.getCurrentDialogueNode().equals(OccupantManagementDialogue.SLAVE_MANAGEMENT_INSPECT)) {
if(CharactersPresentDialogue.characterViewed instanceof NPC && !((NPC)CharactersPresentDialogue.characterViewed).getArtworkList().isEmpty()) {
try {
Artwork artwork = ((NPC)CharactersPresentDialogue.characterViewed).getArtworkList().get(((NPC)CharactersPresentDialogue.characterViewed).getArtworkIndex());
id = "ARTWORK_INFO";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(!artwork.getArtist().getWebsites().isEmpty()) {
Util.openLinkInDefaultBrowser(artwork.getArtist().getWebsites().get(0).getURL());
}
}, false);
MainController.addEventListener(MainController.document, id, "mousemove", MainController.moveTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseleave", MainController.hideTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseenter", new TooltipInformationEventListener().setInformation(
"Artwork by <b style='color:"+artwork.getArtist().getColour().toWebHexString()+";'>"+artwork.getArtist().getName()+"</b>",
(artwork.getArtist().getWebsites().isEmpty()
?"This artist has no associated websites!"
:"Click this button to open <b style='color:"+artwork.getArtist().getColour().toWebHexString()+";'>"+artwork.getArtist().getWebsites().get(0).getName()+"</b>"
+ " ("+artwork.getArtist().getWebsites().get(0).getURL()+") <b>externally</b> in your default browser!")),
false);
}
id = "ARTWORK_PREVIOUS";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(artwork.getTotalArtworkCount()>1) {
artwork.incrementIndex(-1);
CharactersPresentDialogue.resetContent(CharactersPresentDialogue.characterViewed);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
}
}, false);
}
id = "ARTWORK_NEXT";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(artwork.getTotalArtworkCount()>1) {
artwork.incrementIndex(1);
CharactersPresentDialogue.resetContent(CharactersPresentDialogue.characterViewed);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
}
}, false);
}
id = "ARTWORK_ARTIST_PREVIOUS";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(((NPC)CharactersPresentDialogue.characterViewed).getArtworkList().size()>1) {
((NPC)CharactersPresentDialogue.characterViewed).incrementArtworkIndex(-1);
CharactersPresentDialogue.resetContent(CharactersPresentDialogue.characterViewed);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
}
}, false);
}
id = "ARTWORK_ARTIST_NEXT";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(((NPC)CharactersPresentDialogue.characterViewed).getArtworkList().size()>1) {
((NPC)CharactersPresentDialogue.characterViewed).incrementArtworkIndex(1);
CharactersPresentDialogue.resetContent(CharactersPresentDialogue.characterViewed);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
>>>>>>>
|| Main.game.getCurrentDialogueNode().equals(PhoneDialogue.CHARACTER_APPEARANCE)
|| Main.game.getCurrentDialogueNode().equals(OccupantManagementDialogue.SLAVE_MANAGEMENT_INSPECT)) {
GameCharacter character = Main.game.getCurrentDialogueNode().equals(PhoneDialogue.CHARACTER_APPEARANCE) ? Main.game.getPlayer() : CharactersPresentDialogue.characterViewed;
if(character instanceof GameCharacter) {
id = "ARTWORK_ADD";
if (MainController.document.getElementById(id) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
// Create file chooser for .jpg and .png images in the most recently used directory
FileChooser chooser = new FileChooser();
chooser.setTitle("Add Images");
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Images", "*.jpg", "*.png"));
if (lastOpened != null)
chooser.setInitialDirectory(lastOpened);
List<File> files = chooser.showOpenMultipleDialog(Main.primaryStage);
if (files != null && !files.isEmpty()) {
lastOpened = files.get(0).getParentFile();
character.importImages(files);
if (!character.isPlayer()) CharactersPresentDialogue.resetContent(character);
Main.game.setContent(new Response("", "", Main.game.getCurrentDialogueNode()));
}
}, false);
MainController.addEventListener(MainController.document, id, "mousemove", MainController.moveTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseleave", MainController.hideTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseenter", new TooltipInformationEventListener().setInformation(
"Add custom artwork","Browse your own images and add them to the character."),false);
}
if (character.hasArtwork()) {
try {
Artwork artwork = character.getCurrentArtwork();
id = "ARTWORK_INFO";
if (((EventTarget) MainController.document.getElementById(id)) != null) {
((EventTarget) MainController.document.getElementById(id)).addEventListener("click", e -> {
if(!artwork.getArtist().getWebsites().isEmpty()) {
Util.openLinkInDefaultBrowser(artwork.getArtist().getWebsites().get(0).getURL());
}
}, false);
MainController.addEventListener(MainController.document, id, "mousemove", MainController.moveTooltipListener, false);
MainController.addEventListener(MainController.document, id, "mouseleave", MainController.hideTooltipListener, false);
String description;
if (artwork.getArtist().getName().equals("Custom")) {
description = "You added this yourself.";
} else if (artwork.getArtist().getWebsites().isEmpty()) {
description = "This artist has no associated websites!";
} else {
description = "Click to open <b style='color:"+artwork.getArtist().getColour().toWebHexString()+";'>"+artwork.getArtist().getWebsites().get(0).getName()+"</b>"
+ " ("+artwork.getArtist().getWebsites().get(0).getURL()+") <b>externally</b> in your default browser!"; |
<<<<<<<
=======
commandsList.add(new ParserCommand(
Util.newArrayListOfValues(
"heightCm"),
false,
false,
"",//TODO
"Description of method"){//TODO
@Override
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(character.getHeightValue());
}
});
commandsList.add(new ParserCommand(
Util.newArrayListOfValues(
"heightInches"),
false,
false,
"",//TODO
"Description of method"){//TODO
@Override
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(Util.conversionCentimetresToInches(character.getHeightValue()));
}
});
>>>>>>>
<<<<<<<
public String parse(String command, String arguments, String target) {
return Units.size(character.getHeightValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG);
=======
public String parse(String command, String arguments, String target, GameCharacter character) {
return Util.inchesToFeetAndInches(Util.conversionCentimetresToInches(character.getHeightValue()));
>>>>>>>
public String parse(String command, String arguments, String target, GameCharacter character) {
return Units.size(character.getHeightValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG);
<<<<<<<
public String parse(String command, String arguments, String target) {
return Units.weight(character.getWeight() / 1000.0, Units.ValueType.NUMERIC, Units.UnitType.LONG);
=======
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(character.getWeight());
>>>>>>>
public String parse(String command, String arguments, String target, GameCharacter character) {
return Units.weight(character.getWeight() / 1000.0, Units.ValueType.NUMERIC, Units.UnitType.LONG);
<<<<<<<
=======
commandsList.add(new ParserCommand(
Util.newArrayListOfValues(
"penisCm"),
false,
false,
"",
"Description of method",
BodyPartType.PENIS){//TODO
@Override
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(Util.conversionInchesToCentimetres(character.getPenisRawSizeValue()));
}
});
>>>>>>>
<<<<<<<
=======
commandsList.add(new ParserCommand(
Util.newArrayListOfValues(
"secondPenisCm",
"penis2Cm"),
false,
false,
"",
"Description of method",
BodyPartType.PENIS){//TODO
@Override
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(Util.conversionInchesToCentimetres(character.getSecondPenisRawSizeValue()));
}
});
>>>>>>>
<<<<<<<
public String parse(String command, String arguments, String target) {
return Units.size(character.getSecondPenisRawSizeValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG);
=======
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(character.getSecondPenisRawSizeValue());
>>>>>>>
public String parse(String command, String arguments, String target, GameCharacter character) {
return Units.size(character.getSecondPenisRawSizeValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG);
<<<<<<<
public String parse(String command, String arguments, String target) {
return Units.size(character.getVaginaRawClitorisSizeValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG);
=======
public String parse(String command, String arguments, String target, GameCharacter character) {
return String.valueOf(character.getVaginaRawClitorisSizeValue());
>>>>>>>
public String parse(String command, String arguments, String target, GameCharacter character) {
return Units.size(character.getVaginaRawClitorisSizeValue(), Units.ValueType.NUMERIC, Units.UnitType.LONG); |
<<<<<<<
import com.lilithsthrone.utils.Colour;
import com.lilithsthrone.utils.Util;
=======
import com.lilithsthrone.utils.colours.Colour;
import com.lilithsthrone.utils.colours.PresetColour;
>>>>>>>
import com.lilithsthrone.utils.colours.Colour;
import com.lilithsthrone.utils.colours.PresetColour;
import com.lilithsthrone.utils.Util; |
<<<<<<<
import com.lilithsthrone.game.character.GameCharacter;
=======
import com.lilithsthrone.game.character.EquipClothingSetting;
>>>>>>>
import com.lilithsthrone.game.character.GameCharacter;
import com.lilithsthrone.game.character.EquipClothingSetting; |
<<<<<<<
=======
import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.Constants;
>>>>>>>
import org.apache.accumulo.core.Constants; |
<<<<<<<
import com.lilithsthrone.game.inventory.clothing.AbstractClothing;
import com.lilithsthrone.game.inventory.item.TransformativePotion;
=======
import com.lilithsthrone.game.inventory.enchanting.ItemEffect;
import com.lilithsthrone.game.inventory.item.AbstractItemType;
>>>>>>>
import com.lilithsthrone.game.inventory.clothing.AbstractClothing;
import com.lilithsthrone.game.inventory.item.TransformativePotion;
import com.lilithsthrone.game.inventory.enchanting.ItemEffect;
import com.lilithsthrone.game.inventory.item.AbstractItemType;
<<<<<<<
import com.lilithsthrone.world.WorldType;
=======
import com.lilithsthrone.utils.Util.Value;
>>>>>>>
import com.lilithsthrone.world.WorldType;
import com.lilithsthrone.utils.Util.Value;
<<<<<<<
private static List<GameCharacter> impGroup = new ArrayList<>();
private static TransformativePotion potion = null;
private static TransformativePotion companionPotion = null;
=======
private static Value<AbstractItemType, Map<ItemEffect,String>> potion = null;
private static Value<AbstractItemType, Map<ItemEffect,String>> companionPotion = null;
>>>>>>>
private static TransformativePotion potion = null;
private static TransformativePotion companionPotion = null; |
<<<<<<<
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().isEmotional()
=======
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave,"
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
>>>>>>>
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
<<<<<<<
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().isEmotional()
=======
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave,"
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
>>>>>>>
+ "Letting out a disappointed whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
<<<<<<<
+ "Letting out a miserable whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().isEmotional()
=======
+ "Letting out a miserable whine, your [npc.daughter] reluctantly accepts your excuse to leave,"
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
>>>>>>>
+ "Letting out a miserable whine, your [npc.daughter] reluctantly accepts your excuse to leave."
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
<<<<<<<
+ "With a look of despair on [npc.her] face, your [npc.daughter] miserably accepts your excuse to leave."
+ (offspring().getPersonality().isEmotional()
=======
+ "With a look of despair on [npc.her] face, your [npc.daughter] miserably accepts your excuse to leave,"
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
>>>>>>>
+ "With a look of despair on [npc.her] face, your [npc.daughter] miserably accepts your excuse to leave."
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH || offspring().getPersonality().get(PersonalityTrait.NEUROTICISM) == PersonalityWeight.HIGH
<<<<<<<
+ (offspring().getPersonality().isExtroverted()?"[npc.speech(Thanks, [npc.pcName]!)]":"[npc.speech([npc.pcName]... You're embarrassing me...)]")
=======
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH?"[npc.speech(Thanks [npc.pcName]!)]":"[npc.speech([npc.pcName]... You're embarrassing me...)]")
>>>>>>>
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH?"[npc.speech(Thanks, [npc.pcName]!)]":"[npc.speech([npc.pcName]... You're embarrassing me...)]")
<<<<<<<
+ (offspring().getPersonality().isExtroverted()?"[npc.speech(Thanks, [npc.pcName], I'm doing my best!)]":"[npc.speech([npc.pcName]... You're embarrassing me again...)]")
=======
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH?"[npc.speech(Thanks [npc.pcName], I'm doing my best!)]":"[npc.speech([npc.pcName]... You're embarrassing me again...)]")
>>>>>>>
+ (offspring().getPersonality().get(PersonalityTrait.EXTROVERSION) == PersonalityWeight.HIGH?"[npc.speech(Thanks, [npc.pcName], I'm doing my best!)]":"[npc.speech([npc.pcName]... You're embarrassing me again...)]") |
<<<<<<<
descriptionSB.append(UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_RECEIVING_ORAL),
" kneeling on the floor in front of [npc.name]; "+(playerSub?"your":"their")+" faces just [unit.sizes] away from [npc.her] groin..."));
=======
try {
descriptionSB.append(UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_RECEIVING_ORAL),
" kneeling on the floor in front of [npc.name]; "
+(playerSub
?"your"
:(performers.size()>1
?"their faces"
:UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_PERFORMING_ORAL), "[npc.her] [npc.face]")))
+" just inches away from [npc.her] groin..."));
} catch(Exception ex) {
descriptionSB.append(UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_RECEIVING_ORAL), "kneeling on the floor in front of [npc.name]."));
}
>>>>>>>
try {
descriptionSB.append(UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_RECEIVING_ORAL),
" kneeling on the floor in front of [npc.name]; "
+(playerSub
?"your"
:(performers.size()>1
?"their faces"
:UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_PERFORMING_ORAL), "[npc.her] [npc.face]")))
+" just [unit.sizes] away from [npc.her] groin..."));
} catch(Exception ex) {
descriptionSB.append(UtilText.parse(Sex.getCharacterInPosition(SexPositionSlot.KNEELING_RECEIVING_ORAL), "kneeling on the floor in front of [npc.name]."));
} |
<<<<<<<
applyEquipClothingEffects(clonedClothing, slotToEquipInto, null, false);
updateInventoryListeners();
=======
inventory.getClothingCurrentlyEquipped().add(newClothing);
newClothing.setSlotEquippedTo(slotToEquipInto);
newClothing.onEquipApplyEffects(this, this, false);
applyEquipClothingEffects(newClothing, slotToEquipInto, null, false);
>>>>>>>
applyEquipClothingEffects(clonedClothing, slotToEquipInto, null, false);
updateInventoryListeners();
applyEquipClothingEffects(newClothing, slotToEquipInto, null, false); |
<<<<<<<
if(target.getPenisRawSizeValue() < body.getPenis().getRawSizeValue()) {
if(body.getPenis().getRawSizeValue() - target.getPenisRawSizeValue() > 5) {
possibleEffects.add(new PossibleItemEffect(
new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.BOOST, 1),
"Your cock needs to be a lot bigger!"));
if(possibleEffects.size()>=numberOfTransformations) { return new TransformativePotion(itemType, possibleEffects, body); }
=======
if(target.getPenisRawSizeValue() < body.getPenis().getRawLengthValue()) {
if(body.getPenis().getRawLengthValue() - target.getPenisRawSizeValue() > 5) {
possibleEffects.put(new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.BOOST, 1), "Your cock needs to be a lot bigger!");
if(possibleEffects.size()>=numberOfTransformations) { return new Value<>(itemType, possibleEffects); }
>>>>>>>
if(target.getPenisRawSizeValue() < body.getPenis().getRawLengthValue()) {
if(body.getPenis().getRawLengthValue() - target.getPenisRawSizeValue() > 5) {
possibleEffects.add(new PossibleItemEffect(
new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.BOOST, 1),
"Your cock needs to be a lot bigger!"));
if(possibleEffects.size()>=numberOfTransformations) { return new TransformativePotion(itemType, possibleEffects, body); }
<<<<<<<
} else if(target.getPenisRawSizeValue() > body.getPenis().getRawSizeValue()) {
if(target.getPenisRawSizeValue() - body.getPenis().getRawSizeValue() > 5) {
if(possibleEffects.size()>=numberOfTransformations) { return new TransformativePotion(itemType, possibleEffects, body); }
possibleEffects.add(new PossibleItemEffect(
new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.DRAIN, 1),
"Your cock needs to be a lot smaller!"));
=======
} else if(target.getPenisRawSizeValue() > body.getPenis().getRawLengthValue()) {
if(target.getPenisRawSizeValue() - body.getPenis().getRawLengthValue() > 5) {
if(possibleEffects.size()>=numberOfTransformations) { return new Value<>(itemType, possibleEffects); }
possibleEffects.put(new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.DRAIN, 1), "Your cock needs to be a lot smaller!");
>>>>>>>
} else if(target.getPenisRawSizeValue() > body.getPenis().getRawLengthValue()) {
if(target.getPenisRawSizeValue() - body.getPenis().getRawLengthValue() > 5) {
possibleEffects.add(new PossibleItemEffect(
new ItemEffect(itemType.getEnchantmentEffect(), TFModifier.TF_PENIS, TFModifier.TF_MOD_SIZE, TFPotency.DRAIN, 1),
"Your cock needs to be a lot smaller!"));
if(possibleEffects.size()>=numberOfTransformations) { return new TransformativePotion(itemType, possibleEffects, body); } |
<<<<<<<
return UtilText.returnStringAtRandom("muzzle", "face");
case CAT_MORPH_PANTHER:
return UtilText.returnStringAtRandom("muzzle", "face");
=======
>>>>>>>
case CAT_MORPH_PANTHER:
<<<<<<<
return UtilText.returnStringAtRandom("muzzles", "faces");
case CAT_MORPH_PANTHER:
return UtilText.returnStringAtRandom("muzzles", "faces");
=======
>>>>>>>
case CAT_MORPH_PANTHER:
return UtilText.returnStringAtRandom("muzzles", "faces");
<<<<<<<
private static Map<Race, List<FaceType>> typesMap = new HashMap<>();
public static List<FaceType> getFaceTypes(Race r) {
if(typesMap.containsKey(r)) {
return typesMap.get(r);
}
List<FaceType> types = new ArrayList<>();
for(FaceType type : FaceType.values()) {
if(type.getRace()==r) {
types.add(type);
}
}
typesMap.put(r, types);
return types;
}
=======
>>>>>>> |
<<<<<<<
new ListValue<>(OrgasmCumTarget.GROIN),
new ListValue<>(OrgasmCumTarget.LEGS)),
SexActionPresets.playerDoggyBehind,
SexActionPresets.partnerDoggyBehind),
=======
new ListValue<>(OrgasmCumTarget.GROIN))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.GROIN),
new ListValue<>(OrgasmCumTarget.LEGS))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.FACE),
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerDoggyInfront,
SexActionPresets.partnerDoggyInfront),
=======
new ListValue<>(OrgasmCumTarget.FACE))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.FACE),
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerCowgirlOnBack,
SexActionPresets.partnerCowgirlOnBack),
=======
new ListValue<>(OrgasmCumTarget.GROIN))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.STOMACH),
new ListValue<>(OrgasmCumTarget.BREASTS),
new ListValue<>(OrgasmCumTarget.FACE),
new ListValue<>(OrgasmCumTarget.HAIR)),
SexActionPresets.playerCowgirlRiding,
SexActionPresets.partnerCowgirlRiding),
=======
new ListValue<>(OrgasmCumTarget.STOMACH))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.STOMACH),
new ListValue<>(OrgasmCumTarget.BREASTS),
new ListValue<>(OrgasmCumTarget.FACE),
new ListValue<>(OrgasmCumTarget.HAIR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.HAIR),
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerSixtyNineOnTop,
SexActionPresets.partnerSixtyNineOnTop),
=======
new ListValue<>(OrgasmCumTarget.FLOOR))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.HAIR),
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.HAIR),
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerSixtyNineOnBottom,
SexActionPresets.partnerSixtyNineOnBottom),
=======
new ListValue<>(OrgasmCumTarget.FLOOR))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.HAIR),
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerMissionaryOnBack,
SexActionPresets.partnerMissionaryOnBack),
=======
new ListValue<>(OrgasmCumTarget.GROIN),
new ListValue<>(OrgasmCumTarget.STOMACH),
new ListValue<>(OrgasmCumTarget.FLOOR))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerMissionaryAltarSubCultist,
SexActionPresets.partnerMissionaryAltarSubCultist),
=======
new ListValue<>(OrgasmCumTarget.GROIN),
new ListValue<>(OrgasmCumTarget.LEGS),
new ListValue<>(OrgasmCumTarget.FLOOR))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.FLOOR))),
<<<<<<<
new ListValue<>(OrgasmCumTarget.FLOOR)),
SexActionPresets.playerMissionaryAltarSealedSubCultist,
SexActionPresets.partnerMissionaryAltarSealedSubCultist),
=======
new ListValue<>(OrgasmCumTarget.GROIN),
new ListValue<>(OrgasmCumTarget.LEGS),
new ListValue<>(OrgasmCumTarget.FLOOR))),
>>>>>>>
new ListValue<>(OrgasmCumTarget.FLOOR))), |
<<<<<<<
=======
import com.lilithsthrone.game.character.body.CoverableArea;
import com.lilithsthrone.game.character.race.Subspecies;
import com.lilithsthrone.game.dialogue.utils.UtilText;
import com.lilithsthrone.game.inventory.InventorySlot;
import com.lilithsthrone.game.inventory.clothing.AbstractClothing;
import com.lilithsthrone.game.inventory.clothing.DisplacementType;
import javafx.scene.input.KeyCode;
import javafx.scene.paint.Color;
>>>>>>>
<<<<<<<
=======
public static String getDayOfMonthSuffix(int n) {
if (n >= 11 && n <= 13) {
return "th";
}
switch (n % 10) {
case 1: return "st";
case 2: return "nd";
case 3: return "rd";
default: return "th";
}
}
public static String getRoundedFloat(float input, int decimalPlaces) {
return String.format(Locale.ENGLISH,"%."+decimalPlaces+"f", input);
}
>>>>>>>
<<<<<<<
=======
public static int conversionCentimetresToInches(int cm) {
// System.out.println(cm + " -> "+(int)(cm/2.54f));
return Math.round(cm / 2.54f);
}
public static int conversionInchesToCentimetres(int inches) {
return Math.round(inches * 2.54f);
}
public static String centimetresToMetresAndCentimetres(int cm) {
return ((cm / 100) + ((cm % 100) != 0 ? ("." + cm % 100) + "m." : "m"));
}
public static String inchesToFeetAndInches(int inches) {
return inches==0
?"0"+UtilText.INCH_SYMBOL
:((((inches) / 12) == 0 ? "" : (inches) / 12) + (((inches) / 12) > 0 ? UtilText.FOOT_SYMBOL : "") + (((inches) % 12) == 0 ? "" : " ") + (((inches) % 12) != 0 ? ((inches) % 12) + UtilText.INCH_SYMBOL : ""));
}
public static int conversionKilogramsToPounds(int kg) {
return Math.round(kg * 2.20462268f);
}
public static String poundsToStoneAndPounds(int pounds) {
return ((((pounds) / 14) == 0 ? "" : (pounds) / 14) + (((pounds) / 12) > 0 ? "st." : "") + (((pounds) % 14) == 0 ? "" : " ") + (((pounds) % 14) != 0 ? ((pounds) % 14) + "lb" : ""));
}
>>>>>>> |
<<<<<<<
} else if (index == 11) {
if(Main.game.isSavedDialogueNeutral()) {
return new Response("Combat Moves", "Adjust the moves you perform in combat.", CombatMovesSetup.COMBAT_MOVES_CORE) {
@Override
public void effects() {
CombatMovesSetup.setTarget(Main.game.getPlayer());
}
};
} else {
return new Response("Combat Moves", "You are too busy to change your combat moves.", null);
}
=======
} else if (index == 10) {
return new Response("Maps", "Take a look at maps of all the places you've visited.", MAP) {
@Override
public void effects() {
worldTypeMap = Main.game.getPlayer().getWorldLocation();
}
};
>>>>>>>
} else if (index == 10) {
return new Response("Maps", "Take a look at maps of all the places you've visited.", MAP) {
@Override
public void effects() {
worldTypeMap = Main.game.getPlayer().getWorldLocation();
}
};
} else if (index == 11) {
if(Main.game.isSavedDialogueNeutral()) {
return new Response("Combat Moves", "Adjust the moves you perform in combat.", CombatMovesSetup.COMBAT_MOVES_CORE) {
@Override
public void effects() {
CombatMovesSetup.setTarget(Main.game.getPlayer());
}
};
} else {
return new Response("Combat Moves", "You are too busy to change your combat moves.", null);
} |
<<<<<<<
body.getPenis().setPenisSize(null, 8+Util.random.nextInt(13)); // 3-8 inches
=======
body.getPenis().setPenisSize(null, 3+Util.random.nextInt(3)); // 3-5 inches
>>>>>>>
body.getPenis().setPenisSize(null, 8+Util.random.nextInt(13)); // 3-5 inches
<<<<<<<
body.getPenis().setPenisSize(null, 15+Util.random.nextInt(11)); // 6-10 inches
=======
body.getPenis().setPenisSize(null, 3+Util.random.nextInt(4)); // 3-6 inches
>>>>>>>
body.getPenis().setPenisSize(null, 8+Util.random.nextInt(15)); // 3-6 inches |
<<<<<<<
return new RacialEffectUtil(Util.capitaliseSentence(race.getName())+" horns transformation.") {
@Override public String applyEffect() { return target.setHornType(RacialBody.valueOfRace(race).getRandomHornType(false)); } };
=======
HornType hornType = RacialBody.valueOfRace(race).getRandomHornType(false);
return new RacialEffectUtil(hornType==HornType.NONE?"Removes horns.":Util.capitaliseSentence(race.getName())+" horn transformation.", 0, "") {
@Override public String applyEffect() { return target.setHornType(hornType); } };
>>>>>>>
HornType hornType = RacialBody.valueOfRace(race).getRandomHornType(false);
return new RacialEffectUtil(hornType==HornType.NONE?"Removes horns.":Util.capitaliseSentence(race.getName())+" horn transformation.") {
@Override public String applyEffect() { return target.setHornType(hornType); } };
<<<<<<<
return new RacialEffectUtil(Util.capitaliseSentence(race.getName())+" tail transformation.") {
@Override public String applyEffect() { return target.setTailType(RacialBody.valueOfRace(race).getRandomTailType(false)); } };
=======
TailType tailType = RacialBody.valueOfRace(race).getRandomTailType(false);
return new RacialEffectUtil(tailType==TailType.NONE?"Removes tail.":Util.capitaliseSentence(race.getName())+" tail transformation.", 0, "") {
@Override public String applyEffect() { return target.setTailType(tailType); } };
>>>>>>>
TailType tailType = RacialBody.valueOfRace(race).getRandomTailType(false);
return new RacialEffectUtil(tailType==TailType.NONE?"Removes tail.":Util.capitaliseSentence(race.getName())+" tail transformation.") {
@Override public String applyEffect() { return target.setTailType(tailType); } };
<<<<<<<
return new RacialEffectUtil(Util.capitaliseSentence(race.getName())+" wings transformation.") {
@Override public String applyEffect() { return target.setWingType(RacialBody.valueOfRace(race).getRandomWingType(false)); } };
=======
WingType wingType = RacialBody.valueOfRace(race).getRandomWingType(false);
return new RacialEffectUtil(wingType==WingType.NONE?"Removes wings.":Util.capitaliseSentence(race.getName())+" wings transformation.", 0, "") {
@Override public String applyEffect() { return target.setWingType(wingType); } };
>>>>>>>
WingType wingType = RacialBody.valueOfRace(race).getRandomWingType(false);
return new RacialEffectUtil(wingType==WingType.NONE?"Removes wings.":Util.capitaliseSentence(race.getName())+" wings transformation.") {
@Override public String applyEffect() { return target.setWingType(wingType); } }; |
<<<<<<<
import com.lilithsthrone.game.combat.*;
import com.lilithsthrone.rendering.*;
import com.lilithsthrone.utils.*;
=======
import java.util.TreeSet;
import java.util.stream.Collectors;
import com.lilithsthrone.utils.*;
>>>>>>>
import java.util.TreeSet;
import java.util.stream.Collectors;
<<<<<<<
maxAP = DEFAULT_COMBAT_AP;
setLust(getRestingLust());
=======
setLustNoText(getRestingLust());
>>>>>>>
maxAP = DEFAULT_COMBAT_AP;
setLustNoText(getRestingLust()); |
<<<<<<<
if(Main.game.getPlayer().getQuest(QuestLine.MAIN) == Quest.MAIN_1_I_ARTHURS_TALE) {
if(Main.game.getDialogueFlags().values.contains(DialogueFlagValue.waitingOnLilayaPregnancyResults)) { //TODO
if(Main.game.getLilaya().isVisiblyPregnant()) {
UtilText.nodeContentSB.append(// pregnant
"<p>"
+ "As you approach the door to Lilaya's lab, you hear Lilaya's high-pitched shouting getting louder and louder,"
+ " [lilaya.speech(...and I told you three times already! <i>Don't touch my notes!</i>)]"
+ "</p>"
+ "<p>"
+ "Pushing open the door, you see a rather flustered-looking Arthur sitting down on one of the lab's many chairs, his eyes cast to the floor as he endures your demonic aunt's furious scolding."
+ " [arthur.speech(Sorry, Lilaya, I just thought that-)]"
+ "</p>"
+ "<p>"
+ "[lilaya.speech(Be quiet!)]"
+ " Lilaya screams, before suddenly noticing that you're hovering near the door to her lab."
+ " [lilaya.speech([pc.Name]! Come and take a seat, this instant!)]"
+ "</p>"
+ "<p>"
+ "Looking down at your aunt's stomach, you see the reason why she's addressing you in the same furious tone;"
+ " her belly is quite clearly swollen, and it's immediately obvious that you've ended up getting her pregnant."
+ " Knowing from experience that it's best to just do as you're told when your aunt's like this, you walk over to the chair next to Arthur and sit down."
+ "</p>"
+ "<p>"
+ "[lilaya.speech(You can consider yourself very lucky indeed, [pc.name]!)]"
+ " Lilaya shouts, before stepping back and lowering her voice a little,"
+ " [lilaya.speech(I've already decided to forgive you; after all, I've got bigger fish to fry right now.)]"
+ "</p>");
} else {
UtilText.nodeContentSB.append(
"<p>"
+ "As you approach the door to Lilaya's lab, you hear Lilaya's high-pitched shouting getting louder and louder,"
+ " [lilaya.speech(...and I told you three times already! <i>Don't touch my notes!</i>)]"
+ "</p>"
+ "<p>"
+ "Pushing open the door, you see a rather flustered-looking Arthur sitting down on one of the lab's many chairs, his eyes cast to the floor as he endures your demonic aunt's furious scolding,"
+ " [arthur.speech(Sorry, Lilaya, I just thought that-)]"
+ "</p>"
+ "<p>"
+ "[lilaya.speech(Be quiet!)]"
+ " Lilaya screams, before suddenly noticing that you're hovering near the door to her lab."
+ " [lilaya.speech([pc.Name]! Come and take a seat, this instant!)]"
+ "</p>"
+ "<p>"
+ "Knowing from experience that it's best to just do as you're told when your aunt's like this, you walk over to the chair next to Arthur and sit down."
+ " Looking up at your aunt's flat stomach, you see that you didn't end up getting her pregnant after all."
+ "</p>"
+ "<p>"
+ "[lilaya.speech(You can consider yourself very lucky indeed, [pc.name]! As you can see, I'm not pregnant!)]"
+ " Lilaya shouts, before stepping back and lowering her voice a little,"
+ " [lilaya.speech(I've already decided to forgive you; after all, I've got bigger fish to fry right now.)]"
+ "</p>");
=======
return "<p>"
+ "You find yourself walking towards the door to Lilaya's laboratory, and as you get closer, you see that it's been left wide open."
+ " You could walk over to the doorway and enter her lab right now, or continue on your way and choose to come back at another time."
+ "</p>";
}
}
@Override
public Response getResponse(int responseTab, int index) {
if(index==1) {
if(Main.game.getLilaya().hasStatusEffect(StatusEffect.PREGNANT_0)) {
return new Response("Enter", "The door to Lilaya's laboratory is firmly shut. You'd better come back later.", null);
} else {
return new Response("Enter", "Step through the door and enter Lilaya's laboratory", LAB_ENTRY) {
@Override
public void effects() {
if(Main.game.getDialogueFlags().hasFlag(DialogueFlagValue.roseToldOnYou)
&& Main.game.getPlayer().getQuest(QuestLine.MAIN) != Quest.MAIN_1_I_ARTHURS_TALE
&& !Main.game.getDialogueFlags().values.contains(DialogueFlagValue.waitingOnLilayaPregnancyResults)
&& Main.game.getLilaya().getAffection(Main.game.getPlayer())>0) {
Main.game.getTextEndStringBuilder().append(Main.game.getLilaya().incrementAffection(Main.game.getPlayer(), -10));
}
>>>>>>>
return "<p>"
+ "You find yourself walking towards the door to Lilaya's laboratory, and as you get closer, you see that it's been left wide open."
+ " You could walk over to the doorway and enter her lab right now, or continue on your way and choose to come back at another time."
+ "</p>";
}
}
@Override
public Response getResponse(int responseTab, int index) {
if(index==1) {
if(Main.game.getLilaya().hasStatusEffect(StatusEffect.PREGNANT_0)) {
return new Response("Enter", "The door to Lilaya's laboratory is firmly shut. You'd better come back later.", null);
} else {
return new Response("Enter", "Step through the door and enter Lilaya's laboratory", LAB_ENTRY) {
@Override
public void effects() {
if(Main.game.getDialogueFlags().hasFlag(DialogueFlagValue.roseToldOnYou)
&& Main.game.getPlayer().getQuest(QuestLine.MAIN) != Quest.MAIN_1_I_ARTHURS_TALE
&& !Main.game.getDialogueFlags().values.contains(DialogueFlagValue.waitingOnLilayaPregnancyResults)
&& Main.game.getLilaya().getAffection(Main.game.getPlayer())>0) {
Main.game.getTextEndStringBuilder().append(Main.game.getLilaya().incrementAffection(Main.game.getPlayer(), -10));
}
<<<<<<<
+ "[rose.speech(Yes, mistress!)]"
=======
+ "[rose.speech(Yes Mistress!)]"
>>>>>>>
+ "[rose.speech(Yes, Mistress!)]"
<<<<<<<
+ "[rose.speech(Yes, mistress! I'd love to help!)]"
=======
+ "[rose.speech(Yes Mistress! I'd love to help!)]"
>>>>>>>
+ "[rose.speech(Yes, Mistress! I'd love to help!)]" |
<<<<<<<
// Pregnant slimes without a vagina are stuck until the pregnancy is resolved
if(type==BodyMaterial.FLESH && this.getBodyMaterial()==BodyMaterial.SLIME && this.isPregnant() && !this.hasVagina()) {
return UtilText.parse(this,
"<p>"
+ "[npc.NamePos] slimy body starts to tingle all over, and as [npc.she] [npc.verb(look)] down at [npc.her] [npc.arms], [npc.she] [npc.verb(see)] the slime that they're made up of starting to get more and more opaque."
+ " As [npc.her] slime starts to solidify, the little glowing core in the place where [npc.her] heart should be suddenly glows brightly for a bit while a strange feeling permeates [npc.her] groin."
+ "</p>"
+ "<p>"
+ "[npc.She] [npc.verb(feel)] the transformation slow down and then reverse until [npc.her] entire body has reverted to being made entirely out of slime!"
+ "</p>"
+ "<p>"
+ "It seems that the ongoing pregnancy is [style.italicsBad(preventing)] [npc.him] from turning into anything other than a slime, and it looks like [npc.she] will have to give birth first before turning back."
+ "</p>"
+ "<p>"
+ "[npc.NamePos] body is still made out of [style.boldTfGeneric(slime)]!"
+ "</p>");
}
//TODO other material types
=======
>>>>>>>
// Pregnant slimes without a vagina are stuck until the pregnancy is resolved
if(type==BodyMaterial.FLESH && this.getBodyMaterial()==BodyMaterial.SLIME && this.isPregnant() && !this.hasVagina()) {
return UtilText.parse(this,
"<p>"
+ "[npc.NamePos] slimy body starts to tingle all over, and as [npc.she] [npc.verb(look)] down at [npc.her] [npc.arms], [npc.she] [npc.verb(see)] the slime that they're made up of starting to get more and more opaque."
+ " As [npc.her] slime starts to solidify, the little glowing core in the place where [npc.her] heart should be suddenly glows brightly for a bit while a strange feeling permeates [npc.her] groin."
+ "</p>"
+ "<p>"
+ "[npc.She] [npc.verb(feel)] the transformation slow down and then reverse until [npc.her] entire body has reverted to being made entirely out of slime!"
+ "</p>"
+ "<p>"
+ "It seems that the ongoing pregnancy is [style.italicsBad(preventing)] [npc.him] from turning into anything other than a slime, and it looks like [npc.she] will have to give birth first before turning back."
+ "</p>"
+ "<p>"
+ "[npc.NamePos] body is still made out of [style.boldTfGeneric(slime)]!"
+ "</p>");
} |
<<<<<<<
return new PlayerCharacter(new NameTriplet("Player"), "", 1, Gender.M_P_MALE, RacialBody.HUMAN, RaceStage.HUMAN, null, WorldType.DOMINION, Dominion.CITY_AUNTS_HOME);
=======
PlayerCharacter importedCharacter = new PlayerCharacter(new NameTriplet("Player"), "", 1, Gender.M_P_MALE, RacialBody.HUMAN, RaceStage.HUMAN, null, WorldType.DOMINION, PlaceType.DOMINION_AUNTS_HOME);
return importedCharacter;
>>>>>>>
return new PlayerCharacter(new NameTriplet("Player"), "", 1, Gender.M_P_MALE, RacialBody.HUMAN, RaceStage.HUMAN, null, WorldType.DOMINION, PlaceType.DOMINION_AUNTS_HOME); |
<<<<<<<
=======
UtilText.nodeContentSB.append("<p><b>Other difficulty/scenario options:<b></p>");
UtilText.nodeContentSB.append(getContentPreferenceDiv(
"OPPORTUNISTIC_ATTACKERS",
Colour.BASE_CRIMSON,
"Opportunistic attackers",
"This makes random attacks more likely when you're aroused, low on health or otherwise obviously easy prey.",
Main.game.isOpportunisticAttackersEnabled()));
>>>>>>> |
<<<<<<<
=======
import com.lilithsthrone.game.combat.*;
import com.lilithsthrone.rendering.*;
import com.lilithsthrone.utils.*;
>>>>>>>
import com.lilithsthrone.game.combat.*;
import com.lilithsthrone.rendering.*;
import com.lilithsthrone.utils.*;
<<<<<<<
import com.lilithsthrone.game.combat.Attack;
import com.lilithsthrone.game.combat.Combat;
import com.lilithsthrone.game.combat.DamageType;
import com.lilithsthrone.game.combat.SpecialAttack;
import com.lilithsthrone.game.combat.Spell;
import com.lilithsthrone.game.combat.SpellSchool;
import com.lilithsthrone.game.combat.SpellUpgrade;
=======
>>>>>>>
import com.lilithsthrone.game.combat.Attack;
import com.lilithsthrone.game.combat.Combat;
import com.lilithsthrone.game.combat.DamageType;
import com.lilithsthrone.game.combat.SpecialAttack;
import com.lilithsthrone.game.combat.Spell;
import com.lilithsthrone.game.combat.SpellSchool;
import com.lilithsthrone.game.combat.SpellUpgrade;
<<<<<<<
}
this.resetPerksMap();
// PerkManager.initialisePerks(this);
=======
PerkManager.initialisePerks(this);
// Default moves
equipMove("strike");
equipMove("block");
equipMove("tease");
equipMove("avert");
>>>>>>>
}
this.resetPerksMap();
// PerkManager.initialisePerks(this);
// Default moves
equipMove("strike");
equipMove("block");
equipMove("tease");
equipMove("avert");
<<<<<<<
value += 10 + 2*getLevel() + getAttributeValue(Attribute.MAJOR_ARCANE)*2;
}
return Math.round((value + bonusAttributes.get(attribute))*100)/100f;
// return Math.round(bonusAttributes.get(att)*100)/100f;
=======
return 10 + 2*getLevel() + getAttributeValue(Attribute.MAJOR_ARCANE)*2;
}*/
return Math.round(attributes.get(attribute)*100)/100f;
}
public float getBonusAttributeValue(Attribute att) {
return Math.round(bonusAttributes.get(att)*100)/100f;
>>>>>>>
value += 10 + 2*getLevel() + getAttributeValue(Attribute.MAJOR_ARCANE)*2;
}
*/
return Math.round((value + bonusAttributes.get(attribute))*100)/100f;
// return Math.round(bonusAttributes.get(att)*100)/100f; |
<<<<<<<
+ Units.fluid(milked)+" of [pc.milk] added to this room's storage!"
+ "</p>"
+ "<p style='text-align:center; color:"+Colour.GENERIC_BAD.toWebHexString()+";'>"
+ "Being milked is tiring, and you lose 25 energy!"
=======
+ milked+"ml of [pc.milk] added to this room's storage!"
>>>>>>>
+ Units.fluid(milked)+" of [pc.milk] added to this room's storage!"
<<<<<<<
+ Units.fluid(milked)+" of [pc.cum] added to this room's storage!"
+ "</p>"
+ "<p style='text-align:center; color:"+Colour.GENERIC_BAD.toWebHexString()+";'>"
+ "Being milked is tiring, and you lose 25 energy!"
=======
+ milked+"ml of [pc.cum] added to this room's storage!"
>>>>>>>
+ Units.fluid(milked)+" of [pc.cum] added to this room's storage!"
<<<<<<<
+ Units.fluid(milked)+" of [pc.girlcum] added to this room's storage!"
+ "</p>"
+ "<p style='text-align:center; color:"+Colour.GENERIC_BAD.toWebHexString()+";'>"
+ "Being milked is tiring, and you lose 25 energy!"
=======
+ milked+"ml of [pc.girlcum] added to this room's storage!"
>>>>>>>
+ Units.fluid(milked)+" of [pc.girlcum] added to this room's storage!" |
<<<<<<<
if(subspecies==null) {
switch(race) {
case NONE:
break;
case ALLIGATOR_MORPH:
subspecies = Subspecies.ALLIGATOR_MORPH;
break;
case ANGEL:
subspecies = Subspecies.ANGEL;
break;
case CAT_MORPH:
subspecies = Subspecies.CAT_MORPH;
if(body.getHair().getType() == HairType.CAT_MORPH_SIDEFLUFF
&& body.getEar().getType()==EarType.CAT_MORPH_TUFTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.FLUFFY
&& body.getTail().getType()==TailType.CAT_MORPH_SHORT
) {
subspecies = Subspecies.CAT_MORPH_LYNX;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.FLUFFY
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_LEOPARD_SNOW;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_LEOPARD;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
&& body.getTail().getType()==TailType.CAT_MORPH_TUFTED
) {
subspecies = Subspecies.CAT_MORPH_LION;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.STRIPED
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_TIGER;
}
else if(body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
) {
subspecies = Subspecies.CAT_MORPH_CHEETAH;
}
else if(body.getEar().getType()==EarType.CAT_MORPH_TUFTED) {
subspecies = Subspecies.CAT_MORPH_CARACAL;
}
break;
case COW_MORPH:
subspecies = Subspecies.COW_MORPH;
break;
case DEMON:
case ELEMENTAL_AIR:
case ELEMENTAL_ARCANE:
case ELEMENTAL_EARTH:
case ELEMENTAL_FIRE:
case ELEMENTAL_WATER:
subspecies = Subspecies.DEMON;
break;
case IMP:
subspecies = Subspecies.IMP;
if(body.getHeightValue()>Height.NEGATIVE_ONE_TINY.getMinimumValue()) {
subspecies = Subspecies.IMP_ALPHA;
}
break;
case DOG_MORPH:
subspecies = Subspecies.DOG_MORPH;
if(body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPrimaryColour()==Colour.COVERING_BLACK
&& (body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN_DARK
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_TAN)
=======
Subspecies subspecies = null;
switch(race) {
case NONE:
break;
case ALLIGATOR_MORPH:
subspecies = Subspecies.ALLIGATOR_MORPH;
break;
case ANGEL:
subspecies = Subspecies.ANGEL;
break;
case CAT_MORPH:
subspecies = Subspecies.CAT_MORPH;
break;
case COW_MORPH:
subspecies = Subspecies.COW_MORPH;
break;
case DEMON:
case ELEMENTAL_AIR:
case ELEMENTAL_ARCANE:
case ELEMENTAL_EARTH:
case ELEMENTAL_FIRE:
case ELEMENTAL_WATER:
subspecies = Subspecies.DEMON;
break;
case IMP:
subspecies = Subspecies.IMP;
if(body.getHeightValue()>Height.NEGATIVE_ONE_TINY.getMinimumValue()) {
subspecies = Subspecies.IMP_ALPHA;
}
break;
case DOG_MORPH:
subspecies = Subspecies.DOG_MORPH;
if(body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPrimaryColour()==Colour.COVERING_BLACK
&& (body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN_DARK
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_TAN)
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPattern() == CoveringPattern.MARKED
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getModifier() == CoveringModifier.SHORT
) {
subspecies = Subspecies.DOG_MORPH_DOBERMANN;
}
if(body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPrimaryColour()==Colour.COVERING_BLACK
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_WHITE
>>>>>>>
Subspecies subspecies = null;
switch(race) {
case NONE:
break;
case ALLIGATOR_MORPH:
subspecies = Subspecies.ALLIGATOR_MORPH;
break;
case ANGEL:
subspecies = Subspecies.ANGEL;
break;
case CAT_MORPH:
subspecies = Subspecies.CAT_MORPH;
if(body.getHair().getType() == HairType.CAT_MORPH_SIDEFLUFF
&& body.getEar().getType()==EarType.CAT_MORPH_TUFTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.FLUFFY
&& body.getTail().getType()==TailType.CAT_MORPH_SHORT
) {
subspecies = Subspecies.CAT_MORPH_LYNX;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.FLUFFY
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_LEOPARD_SNOW;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_LEOPARD;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
&& body.getTail().getType()==TailType.CAT_MORPH_TUFTED
) {
subspecies = Subspecies.CAT_MORPH_LION;
}
else if(body.getFace().getType() == FaceType.CAT_MORPH_PANTHER
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.STRIPED
&& body.getTail().getType()==TailType.CAT_MORPH
) {
subspecies = Subspecies.CAT_MORPH_TIGER;
}
else if(body.getCoverings().get(BodyCoveringType.FELINE_FUR).getPattern() == CoveringPattern.SPOTTED
&& body.getCoverings().get(BodyCoveringType.FELINE_FUR).getModifier() == CoveringModifier.SHORT
) {
subspecies = Subspecies.CAT_MORPH_CHEETAH;
}
else if(body.getEar().getType()==EarType.CAT_MORPH_TUFTED) {
subspecies = Subspecies.CAT_MORPH_CARACAL;
}
break;
case COW_MORPH:
subspecies = Subspecies.COW_MORPH;
break;
case DEMON:
case ELEMENTAL_AIR:
case ELEMENTAL_ARCANE:
case ELEMENTAL_EARTH:
case ELEMENTAL_FIRE:
case ELEMENTAL_WATER:
subspecies = Subspecies.DEMON;
break;
case IMP:
subspecies = Subspecies.IMP;
if(body.getHeightValue()>Height.NEGATIVE_ONE_TINY.getMinimumValue()) {
subspecies = Subspecies.IMP_ALPHA;
}
break;
case DOG_MORPH:
subspecies = Subspecies.DOG_MORPH;
if(body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPrimaryColour()==Colour.COVERING_BLACK
&& (body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_BROWN_DARK
|| body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_TAN)
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPattern() == CoveringPattern.MARKED
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getModifier() == CoveringModifier.SHORT
) {
subspecies = Subspecies.DOG_MORPH_DOBERMANN;
}
if(body.getCoverings().get(BodyCoveringType.CANINE_FUR).getPrimaryColour()==Colour.COVERING_BLACK
&& body.getCoverings().get(BodyCoveringType.CANINE_FUR).getSecondaryColour()==Colour.COVERING_WHITE |
<<<<<<<
import com.lilithsthrone.game.character.body.tags.FaceTypeTag;
=======
import com.lilithsthrone.game.character.body.tags.ArmTypeTag;
>>>>>>>
import com.lilithsthrone.game.character.body.tags.FaceTypeTag;
import com.lilithsthrone.game.character.body.tags.ArmTypeTag; |
<<<<<<<
this.setPenisGirth(PenisGirth.ZERO_SLENDER);
this.setPenisSize(8);
=======
this.setPenisGirth(PenisGirth.ONE_THIN);
this.setPenisSize(3);
>>>>>>>
this.setPenisGirth(PenisGirth.ONE_THIN);
this.setPenisSize(8); |
<<<<<<<
Mutation m = new Mutation(new Text(String.format("%06d", i)));
m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), new Value("junk".getBytes()));
=======
Mutation m = new Mutation(new Text(String.format("%05d", i)));
m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), new Value("junk".getBytes(Constants.UTF8)));
>>>>>>>
Mutation m = new Mutation(new Text(String.format("%06d", i)));
m.put(new Text("col" + Integer.toString((i % 3) + 1)), new Text("qual"), new Value("junk".getBytes(Constants.UTF8))); |
<<<<<<<
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.util.HashSet;
import java.util.Set;
=======
import javafx.application.Application;
import com.cathive.fx.guice.controllerlookup.FXMLLoadingModule;
>>>>>>>
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.util.HashSet;
import java.util.Set;
import javafx.application.Application;
import com.cathive.fx.guice.controllerlookup.FXMLLoadingModule;
<<<<<<<
/**
* Helper method to determine whether a given constructor is annotated with one of the Inject annotations
* known by Guice.
* @param constructor
* Constructor to be analyzed. Must not be <code>null</code>
* @return
* <code>true</code> if the given constructor is annotated with an Inject annotation,
* <code>false<code> otherwise.
* @see javax.inject.Inject
* @see com.google.inject.Inject
*/
private static final boolean isInjectAnnotationPresent(final Constructor<?> constructor) {
for (final Class<? extends Annotation> annotationClass: injectAnnotationClasses) {
if (constructor.isAnnotationPresent(annotationClass)) {
// Directly returns if an @Inject annotation can be found.
return true;
}
}
return false;
}
=======
>>>>>>>
/**
* Helper method to determine whether a given constructor is annotated with one of the Inject annotations
* known by Guice.
* @param constructor
* Constructor to be analyzed. Must not be <code>null</code>
* @return
* <code>true</code> if the given constructor is annotated with an Inject annotation,
* <code>false<code> otherwise.
* @see javax.inject.Inject
* @see com.google.inject.Inject
*/
private static final boolean isInjectAnnotationPresent(final Constructor<?> constructor) {
for (final Class<? extends Annotation> annotationClass: injectAnnotationClasses) {
if (constructor.isAnnotationPresent(annotationClass)) {
// Directly returns if an @Inject annotation can be found.
return true;
}
}
return false;
} |
<<<<<<<
logger.minorCompactionFinished(tablet, newDatafile, walogSeq);
markUnusedWALs();
=======
logger.minorCompactionFinished(tablet, newDatafile, walogSeq, durability);
>>>>>>>
logger.minorCompactionFinished(tablet, newDatafile, walogSeq, durability);
markUnusedWALs(); |
<<<<<<<
@Override
public void setJobListening(String id, boolean listening,
ServerRequestCallback<JsArray<JobOutput>> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(id));
params.set(1, JSONBoolean.getInstance(listening));
sendRequest(RPC_SCOPE, "set_job_listening", params, callback);
}
=======
@Override
public void hasShinyTestDependenciesInstalled(ServerRequestCallback<Boolean> callback)
{
sendRequest(RPC_SCOPE,
HAS_SHINYTEST_HAS_DEPENDENCIES,
callback);
}
@Override
public void installShinyTestDependencies(ServerRequestCallback<ConsoleProcess> callback)
{
sendRequest(RPC_SCOPE,
INSTALL_SHINYTEST_DEPENDENCIES,
new ConsoleProcessCallbackAdapter(callback));
}
@Override
public void hasShinyTestResults(String shinyApp, String testName, ServerRequestCallback<Boolean> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(shinyApp));
params.set(1, new JSONString(testName));
sendRequest(RPC_SCOPE,
HAS_SHINYTEST_RESULTS,
params,
true,
callback);
}
>>>>>>>
@Override
public void setJobListening(String id, boolean listening,
ServerRequestCallback<JsArray<JobOutput>> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(id));
params.set(1, JSONBoolean.getInstance(listening));
sendRequest(RPC_SCOPE, "set_job_listening", params, callback);
}
public void hasShinyTestDependenciesInstalled(ServerRequestCallback<Boolean> callback)
{
sendRequest(RPC_SCOPE,
HAS_SHINYTEST_HAS_DEPENDENCIES,
callback);
}
@Override
public void installShinyTestDependencies(ServerRequestCallback<ConsoleProcess> callback)
{
sendRequest(RPC_SCOPE,
INSTALL_SHINYTEST_DEPENDENCIES,
new ConsoleProcessCallbackAdapter(callback));
}
@Override
public void hasShinyTestResults(String shinyApp, String testName, ServerRequestCallback<Boolean> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(shinyApp));
params.set(1, new JSONString(testName));
sendRequest(RPC_SCOPE,
HAS_SHINYTEST_RESULTS,
params,
true,
callback);
} |
<<<<<<<
* Key for making Zotero API calls
*/
public PrefValue<String> zoteroApiKey()
{
return string(
"zotero_api_key",
"Zotero API Key",
"Key for making Zotero API calls",
"");
}
/**
=======
* The name of the editor to use to provide code editing in visual mode
*/
public PrefValue<String> visualMarkdownCodeEditor()
{
return enumeration(
"visual_markdown_code_editor",
"Editor for code chunks in visual editing mode",
"The name of the editor to use to provide code editing in visual mode",
new String[] {
VISUAL_MARKDOWN_CODE_EDITOR_ACE,
VISUAL_MARKDOWN_CODE_EDITOR_CODEMIRROR
},
"ace");
}
public final static String VISUAL_MARKDOWN_CODE_EDITOR_ACE = "ace";
public final static String VISUAL_MARKDOWN_CODE_EDITOR_CODEMIRROR = "codemirror";
/**
>>>>>>>
* The name of the editor to use to provide code editing in visual mode
*/
public PrefValue<String> visualMarkdownCodeEditor()
{
return enumeration(
"visual_markdown_code_editor",
"Editor for code chunks in visual editing mode",
"The name of the editor to use to provide code editing in visual mode",
new String[] {
VISUAL_MARKDOWN_CODE_EDITOR_ACE,
VISUAL_MARKDOWN_CODE_EDITOR_CODEMIRROR
},
"ace");
}
public final static String VISUAL_MARKDOWN_CODE_EDITOR_ACE = "ace";
public final static String VISUAL_MARKDOWN_CODE_EDITOR_CODEMIRROR = "codemirror";
/**
* Key for making Zotero API calls
*/
public PrefValue<String> zoteroApiKey()
{
return string(
"zotero_api_key",
"Zotero API Key",
"Key for making Zotero API calls",
"");
}
/**
<<<<<<<
if (source.hasKey("zotero_api_key"))
zoteroApiKey().setValue(layer, source.getString("zotero_api_key"));
=======
if (source.hasKey("visual_markdown_code_editor"))
visualMarkdownCodeEditor().setValue(layer, source.getString("visual_markdown_code_editor"));
>>>>>>>
if (source.hasKey("visual_markdown_code_editor"))
visualMarkdownCodeEditor().setValue(layer, source.getString("visual_markdown_code_editor"));
if (source.hasKey("zotero_api_key"))
zoteroApiKey().setValue(layer, source.getString("zotero_api_key"));
<<<<<<<
prefs.add(zoteroApiKey());
=======
prefs.add(visualMarkdownCodeEditor());
>>>>>>>
prefs.add(visualMarkdownCodeEditor());
prefs.add(zoteroApiKey()); |
<<<<<<<
pendingInput_.setText("");
pendingInput_.setVisible(false);
output(input, styles_.input() + KEYWORD_CLASS_NAME, false);
=======
output(input, styles_.command() + KEYWORD_CLASS_NAME, false);
>>>>>>>
pendingInput_.setText("");
pendingInput_.setVisible(false);
output(input, styles_.command() + KEYWORD_CLASS_NAME, false); |
<<<<<<<
PanmirrorUIExecute uiExecute,
PanmirrorUIChunkFactory uiChunks,
TextEditingTarget target)
=======
PanmirrorUIExecute uiExecute)
>>>>>>>
PanmirrorUIChunkFactory uiChunks,
PanmirrorUIExecute uiExecute)
<<<<<<<
this.ui = new PanmirrorUI(uiContext, uiDisplay, uiExecute, uiChunks);
this.server = new PanmirrorServer(target);
=======
this.ui = new PanmirrorUI(uiContext, uiDisplay, uiExecute);
>>>>>>>
this.ui = new PanmirrorUI(uiContext, uiDisplay, uiExecute, uiChunks); |
<<<<<<<
=======
import org.rstudio.core.client.widget.FixedTextArea;
import org.rstudio.core.client.widget.MessageDialog;
import org.rstudio.core.client.widget.Operation;
>>>>>>>
import org.rstudio.core.client.widget.FixedTextArea;
<<<<<<<
private CheckBox chkVcsIgnoreSrc_;
=======
private CheckBox chkVcsIgnoreSrc_;
private VerticalPanel panelExternalPackages_;
private TextArea taExternalPackages_;
private VerticalPanel panelLocalRepos_;
private TextArea taLocalRepos_;
private ThemedButton usePackratButton_;
>>>>>>>
private CheckBox chkVcsIgnoreSrc_;
private VerticalPanel panelExternalPackages_;
private TextArea taExternalPackages_;
private VerticalPanel panelLocalRepos_;
private TextArea taLocalRepos_; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.