Skip to content

Commit 17ddc88

Browse files
tterrag1098tterrag1098
committed
Merge branch '1.7/dev' into 1.7/release
Conflicts: gradle.properties
2 parents 19e1f72 + ad70e12 commit 17ddc88

File tree

265 files changed

+2259
-2418
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+2259
-2418
lines changed

‎build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ext.buildnumber = 0
3232
project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : project.ext.gitHash
3333

3434
version = "${mod_version}.${buildnumber}"
35-
group = "com.cricketcraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
36-
archivesBaseName = dev ? "Chisel2_DEV" : "Chisel2"
35+
group = "team.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
36+
archivesBaseName = dev ? "Chisel_DEV" : "Chisel"
3737

3838
minecraft {
3939
version = "${minecraft_version}-${forge_version}"
@@ -185,7 +185,7 @@ curse {
185185
projectId = project.projectId
186186
changelog = System.getenv("CHANGELOG").equals("none") ? getChangelogText() : System.getenv("CHANGELOG")
187187
releaseType = 'release'
188-
displayName = "Chisel 2 - ${mod_version}"
188+
displayName = "Chisel - ${mod_version}"
189189
additionalArtifact deobfJar, sourcesJar, apiJar
190190
}
191191

‎changelog

+26
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
CT2.5.0:
2+
New
3+
- Lots of new endstone variants
4+
- Purpur blocks
5+
- New technical blocks (piping, battery, and more)
6+
7+
Changes
8+
- Under new management! Name of the project has been changed to "Chisel"
9+
- Now includes CTMLib 1.2.0-10
10+
- Greatly improve the look of energized voidstone
11+
- Retexture 2 of the voidstone variants (bevel and metalborder)
12+
- Removed special player rendering
13+
- Fixed EMC registrations so that they are actually dynamic
14+
- Lavastone and Waterstone now use the still texture, not flowing
15+
16+
Fixes
17+
- Fix "The Turkey Bug"
18+
- Fix crash when an unchiselable item made its way into the autochisel
19+
- Fix VariationInfos always returning CUSTOM for their texture type
20+
- Fix antiblocks not working when smooth lighting is off
21+
- Fix Botania compat
22+
- Fix pick block on bookshelves
23+
24+
API
25+
- Add IConnectable for allowing other blocks to determine if chisel blocks will connect to them
26+
127
2.4.1:
228
New
329
- New UberWavy futura block

‎eclipseFormat.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
2727
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
2828
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
29-
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
29+
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="49"/>
3030
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
3131
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
3232
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
3333
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
34-
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
34+
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="1"/>
3535
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
3636
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
3737
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>

‎gradle.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
mod_version=2.4.1
1+
mod_version=CT2.5.0
22
minecraft_version=1.7.10
33
forge_version=10.13.4.1481-1.7.10
44

5-
ctmlib_version=1.0.1.5
6-
ccl_version=1.1.3.136
7-
ccc_version=1.0.6.43
8-
nei_version=1.0.4.107
5+
ctmlib_version=1.2.0-10
6+
ccl_version=1.1.3.140
7+
ccc_version=1.0.7.46
8+
nei_version=1.0.5.111
99
waila_version=1.5.10
1010
fmp_version=1.2.0.344
1111

12-
projectId=225236
12+
projectId=235279

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = 'Chisel2'
1+
rootProject.name = 'Chisel'

‎src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
public class ChiselAPIProps {
44

55
public static final String VERSION = "0.1.0";
6-
public static String MOD_ID = null; // Set by Chisel
6+
public static String MOD_ID = null; // Set by Chisel
77
}

‎src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
package com.cricketcraft.chisel.api;
22

3-
import com.cricketcraft.chisel.api.carving.IChiselMode;
4-
53
import net.minecraft.item.ItemStack;
64

5+
import com.cricketcraft.chisel.api.carving.IChiselMode;
6+
77
/**
8-
* Implement this on chisel items which require more control over chisel modes
9-
* (including adding new modes).
8+
* Implement this on chisel items which require more control over chisel modes (including adding new modes).
109
*/
1110
public interface IAdvancedChisel {
1211

1312
/**
14-
* Gets the next mode the button in the GUI should switch to given the
15-
* current mode.
13+
* Gets the next mode the button in the GUI should switch to given the current mode.
1614
*
1715
* @param stack
1816
* The {@link ItemStack} representing the chisel

‎src/main/java/com/cricketcraft/chisel/api/ICarvable.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.cricketcraft.chisel.api;
22

3-
import net.minecraft.item.ItemStack;
43
import net.minecraft.world.IBlockAccess;
54

65
import com.cricketcraft.chisel.api.carving.CarvableHelper;
76
import com.cricketcraft.chisel.api.carving.IVariationInfo;
7+
import com.cricketcraft.ctmlib.ICTMBlock;
88
import com.cricketcraft.ctmlib.ISubmapManager;
99

1010
/**
1111
* To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes.
1212
*/
13-
public interface ICarvable {
13+
public interface ICarvable extends ICTMBlock<IVariationInfo> {
1414

1515
/**
1616
* Gets a {@link ISubmapManager} from this block, based on metadata.
@@ -31,15 +31,14 @@ public interface ICarvable {
3131
* The metadata of the block
3232
* @return The {@link ISubmapManager} that represents this block in the world.
3333
*/
34-
public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata);
34+
@Override
35+
public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata);
3536

3637
/**
3738
* Gets the {@link ISubmapManager} for this block when it is in item form.
3839
*
39-
* @param stack
40-
* The {@link ItemStack} representing this block;
4140
* @return A {@link ISubmapManager}
4241
*/
43-
public IVariationInfo getVariation(ItemStack stack);
42+
@Override
43+
public IVariationInfo getManager(int meta);
4444
}
45-

‎src/main/java/com/cricketcraft/chisel/api/IConnectable.java

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.cricketcraft.chisel.api;
2+
3+
import net.minecraft.world.IBlockAccess;
4+
5+
/**
6+
* This extension of {@link IFacade} allows the block to say whether or not OTHER CTM blocks can connect to IT.
7+
*/
8+
public interface IConnectable {
9+
10+
/**
11+
* Determines whether other CTM blocks can connect to this one.
12+
*
13+
* @param world
14+
* @param x
15+
* The X position of the block that is connecting to this one. NOT the position of your block.
16+
* @param y
17+
* The Y position of the block that is connecting to this one. NOT the position of your block.
18+
* @param z
19+
* The Z position of the block that is connecting to this one. NOT the position of your block.
20+
* @param side
21+
* The side being drawn.
22+
* @return True if a block can connect to this one from the given direction. False otherwise.
23+
*/
24+
boolean canConnectCTM(IBlockAccess world, int x, int y, int z, int side);
25+
26+
}

‎src/main/java/com/cricketcraft/chisel/api/IFacade.java

+39-30
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,45 @@
55
import net.minecraft.world.World;
66

77
/**
8-
* To be implemented on blocks that "hide" another block inside, so connected textuers can still be
9-
* accomplished.
8+
* To be implemented on blocks that "hide" another block inside, so connected textuers can still be accomplished.
109
*/
11-
public interface IFacade
12-
{
13-
/**
14-
* Gets the block this facade is acting as.
15-
*
16-
* @param world {@link World}
17-
* @param x X coord of your block
18-
* @param y Y coord of your block
19-
* @param z Z coord of your block
20-
* @param side The side being rendered, NOT the side being connected from.
21-
* <p>
22-
* This value can be -1 if no side is specified. Please handle this appropriately.
23-
* @return The block inside of your facade block.
24-
*/
25-
Block getFacade(IBlockAccess world, int x, int y, int z, int side);
10+
public interface IFacade {
2611

27-
/**
28-
* Gets the metadata of the block that this facade is acting as.
29-
*
30-
* @param world {@link World}
31-
* @param x X coord of your block
32-
* @param y Y coord of your block
33-
* @param z Z coord of your block
34-
* @param side The side being rendered, NOT the side being connected from.
35-
* <p>
36-
* This value can be -1 if no side is specified. Please handle this appropriately.
37-
* @return The metadata of your facade block.
38-
*/
39-
int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
12+
/**
13+
* Gets the block this facade is acting as.
14+
*
15+
* @param world
16+
* {@link World}
17+
* @param x
18+
* X coord of your block
19+
* @param y
20+
* Y coord of your block
21+
* @param z
22+
* Z coord of your block
23+
* @param side
24+
* The side being rendered, NOT the side being connected from.
25+
* <p>
26+
* This value can be -1 if no side is specified. Please handle this appropriately.
27+
* @return The block inside of your facade block.
28+
*/
29+
Block getFacade(IBlockAccess world, int x, int y, int z, int side);
30+
31+
/**
32+
* Gets the metadata of the block that this facade is acting as.
33+
*
34+
* @param world
35+
* {@link World}
36+
* @param x
37+
* X coord of your block
38+
* @param y
39+
* Y coord of your block
40+
* @param z
41+
* Z coord of your block
42+
* @param side
43+
* The side being rendered, NOT the side being connected from.
44+
* <p>
45+
* This value can be -1 if no side is specified. Please handle this appropriately.
46+
* @return The metadata of your facade block.
47+
*/
48+
int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
4049
}

‎src/main/java/com/cricketcraft/chisel/api/Statistics.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
public class Statistics {
88

9-
public static StatBase blocksChiseled = (new StatBasic("stat.blockChiseled", new ChatComponentTranslation("stat.blockChiseled", new Object[0])));
9+
public static StatBase blocksChiseled = (new StatBasic("stat.blockChiseled", new ChatComponentTranslation("stat.blockChiseled", new Object[0])));
1010

11-
public static void init(){
12-
blocksChiseled.initIndependentStat();
13-
blocksChiseled.registerStat();
14-
}
11+
public static void init() {
12+
blocksChiseled.initIndependentStat();
13+
blocksChiseled.registerStat();
14+
}
1515
}

0 commit comments

Comments
 (0)